diff -ur freeciv.upstream/common/packets.c freeciv/common/packets.c
--- freeciv.upstream/common/packets.c	Wed Jun  7 13:32:14 2000
+++ freeciv/common/packets.c	Fri Jun  9 09:53:16 2000
@@ -3520,9 +3520,7 @@
     fd_set writefs;
     struct timeval tv;
 
-#define MY_FD_ZERO(p) memset((void *)(p), 0, sizeof(*(p)))
-
-    MY_FD_ZERO(&writefs);
+    FD_ZERO(&writefs);
     FD_SET(pc->sock, &writefs);
 
     tv.tv_sec = 2; tv.tv_usec = 0;
diff -ur freeciv.upstream/common/support.h freeciv/common/support.h
--- freeciv.upstream/common/support.h	Sun Jan  2 04:59:43 2000
+++ freeciv/common/support.h	Fri Jun  9 10:02:03 2000
@@ -23,6 +23,10 @@
 #include <stdlib.h>		/* size_t */
 #include <stdarg.h>
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 #include "attribute.h"
 
 int mystrcasecmp(const char *str0, const char *str1);
@@ -42,5 +46,9 @@
      fc__attribute((format (printf, 3, 4)));
 
 int my_vsnprintf(char *str, size_t n, const char *format, va_list ap );
+
+#ifndef FD_ZERO
+#define FD_ZERO(p) memset((void *)(p), 0, sizeof(*(p)))
+#endif
 
 #endif  /* FC__SUPPORT_H */
diff -ur freeciv.upstream/server/sernet.c freeciv/server/sernet.c
--- freeciv.upstream/server/sernet.c	Wed Jun  7 13:32:15 2000
+++ freeciv/server/sernet.c	Fri Jun  9 09:53:09 2000
@@ -74,8 +74,6 @@
 
 #include "sernet.h"
 
-#define MY_FD_ZERO(p) memset((void *)(p), 0, sizeof(*(p)))
-
 struct connection connections[MAX_NUM_CONNECTIONS];
 
 #ifdef GENERATING_MAC      /* mac network globals */
@@ -151,7 +149,7 @@
     tv.tv_sec=1;
     tv.tv_usec=0;
     
-    MY_FD_ZERO(&readfs);
+    FD_ZERO(&readfs);
     FD_SET(0, &readfs);	
     FD_SET(sock, &readfs);
     max_desc=sock;