Index: client/clinet.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/clinet.c,v
retrieving revision 1.74
diff -u -r1.74 clinet.c
--- client/clinet.c	2002/09/17 13:09:47	1.74
+++ client/clinet.c	2002/10/24 14:46:20
@@ -288,7 +288,7 @@
       }
 
       freelog(LOG_NORMAL, "error in select() return=%d errno=%d (%s)",
-	      n, errno, strerror(errno));
+	      n, errno, mystrerror(errno));
       return -1;
     }
 
Index: common/netintf.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/netintf.c,v
retrieving revision 1.13
diff -u -r1.13 netintf.c
--- common/netintf.c	2002/03/05 15:46:22	1.13
+++ common/netintf.c	2002/10/24 14:46:20
@@ -23,6 +23,9 @@
 #include <signal.h>
 #include <string.h>
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -53,7 +56,6 @@
 
 #include "log.h"
 #include "support.h"
-#include "shared.h"		/* TRUE, FALSE */
 
 #include "netintf.h"
 
Index: common/shared.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/shared.c,v
retrieving revision 1.92
diff -u -r1.92 shared.c
--- common/shared.c	2002/09/27 12:32:44	1.92
+++ common/shared.c	2002/10/24 14:46:21
@@ -39,7 +39,6 @@
 #include "fcintl.h"
 #include "log.h"
 #include "mem.h"
-#include "support.h"
 
 #include "shared.h"
 
@@ -858,7 +857,7 @@
 		dirs[dir_num]);
       } else {
 	freelog(LOG_ERROR, _("Could not read data directory %s: %s."),
-		dirs[dir_num], strerror(errno));
+		dirs[dir_num], mystrerror(errno));
       }
       continue;
     }
Index: common/shared.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/shared.h,v
retrieving revision 1.104
diff -u -r1.104 shared.h
--- common/shared.h	2002/10/09 20:54:20	1.104
+++ common/shared.h	2002/10/24 14:46:21
@@ -13,22 +13,12 @@
 #ifndef FC__SHARED_H
 #define FC__SHARED_H
 
-#include <stdlib.h>		/* size_t */
-
-
-/* Want to use GCC's __attribute__ keyword to check variadic
- * parameters to printf-like functions, without upsetting other
- * compilers: put any required defines magic here.
- * If other compilers have something equivalent, could also
- * work that out here.   Should this use configure stuff somehow?
- * --dwp
- */
-#if defined(__GNUC__)
-#define fc__attribute(x)  __attribute__(x)
-#else
-#define fc__attribute(x)
-#endif
+/* Poison functions to prevent them from being used (portability) */
+#pragma GCC poison snprintf vsnprintf strcasecmp strncasecmp usleep
+#pragma GCC poison strerror gethostname
 
+#include <stdlib.h>		/* size_t */
+#include "support.h"		/* bool */
 
 /* Note: the capability string is now in capstr.c --dwp */
 /* Version stuff is now in version.h --dwp */
@@ -53,8 +43,6 @@
 #ifndef FALSE
 #define FALSE (0)
 #endif
-
-typedef int bool;
 
 #ifndef MAX
 #define MAX(x,y) (((x)>(y))?(x):(y))
Index: common/support.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/support.c,v
retrieving revision 1.22
diff -u -r1.22 support.c
--- common/support.c	2002/10/19 02:36:08	1.22
+++ common/support.c	2002/10/24 14:46:21
@@ -86,7 +86,7 @@
 
 #include "fcintl.h"
 #include "mem.h"
-#include "netintf.h"
+/* #include "netintf.h"*/
 
 #include "support.h"
 
Index: common/support.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/support.h,v
retrieving revision 1.16
diff -u -r1.16 support.h
--- common/support.h	2002/10/09 20:54:20	1.16
+++ common/support.h	2002/10/24 14:46:21
@@ -27,7 +27,20 @@
 #include <sys/types.h>
 #endif
 
-#include "shared.h"		/* bool type and fc__attribute */
+/* Want to use GCC's __attribute__ keyword to check variadic
+ * parameters to printf-like functions, without upsetting other
+ * compilers: put any required defines magic here.
+ * If other compilers have something equivalent, could also
+ * work that out here.   Should this use configure stuff somehow?
+ * --dwp
+ */
+#if defined(__GNUC__)
+#define fc__attribute(x)  __attribute__(x)
+#else
+#define fc__attribute(x)
+#endif
+
+typedef int bool;
 
 int mystrcasecmp(const char *str0, const char *str1);
 int mystrncasecmp(const char *str0, const char *str1, size_t n);