moved Point and Rect types to id_us.c, as they are only used in one place,

and the type names conflict with some headers for another operating system.

src/id_heads.h

@@ -60,14 +60,6 @@ typedef long fixed;
 
 typedef void * memptr;
 
-typedef	struct {
-	int x, y;
-} Point;
-
-typedef	struct {
-	Point ul, lr;
-} Rect;
-
 #include "misc.h"
 
 #include "vi_comm.h"

src/id_us.c

 #include "wl_def.h"
 
+typedef	struct {
+	int x, y;
+} Point;
+
+typedef	struct {
+	Point ul, lr;
+} Rect;
+
 //	Global variables
 boolean		NoWait;
 word		PrintX,PrintY;
@@ -115,7 +123,7 @@ void US_PrintUnsigned(longword n)
 //	USL_PrintInCenter() - Prints a string in the center of the given rect
 //
 ///////////////////////////////////////////////////////////////////////////
-void USL_PrintInCenter(const char *s, Rect r)
+static void USL_PrintInCenter(const char *s, Rect r)
 {
 	word w, h, rw, rh;
 

src/id_us.h

@@ -39,6 +39,4 @@ boolean	US_LineInput(int x,int y,char *buf,const char *def,boolean escok,
 				int maxchars,int maxwidth);
 int				US_RndT();
 
-void	USL_PrintInCenter(const char *s,Rect r);
-
 #endif