--- vnc_unixsrc/Xvnc/lib/Xau/AuRead.c.old	2004-09-17 20:34:15.226303649 -0700
+++ vnc_unixsrc/Xvnc/lib/Xau/AuRead.c	2004-09-17 20:34:31.743582524 -0700
@@ -49,7 +49,7 @@
 FILE	*file;
 {
     unsigned short  len;
-    char	    *data, *malloc ();
+    char	    *data;
 
     if (read_short (&len, file) == 0)
 	return 0;
@@ -76,7 +76,6 @@
 {
     Xauth   local;
     Xauth   *ret;
-    char    *malloc ();
 
     if (read_short (&local.family, auth_file) == 0)
 	return 0;
--- vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c.old	2004-09-17 20:37:50.192903801 -0700
+++ vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c	2004-09-17 20:37:58.067083299 -0700
@@ -61,8 +61,6 @@
 FILE	*auth_file;
 Xauth	*auth;
 {
-    char    *malloc ();
-
     if (write_short (auth->family, auth_file) == 0)
 	return 0;
     if (write_counted_string (auth->address_length, auth->address, auth_file) == 0)
--- vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c.old	2004-09-17 20:35:33.598137184 -0700
+++ vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c	2004-09-17 20:35:40.435424729 -0700
@@ -31,8 +31,6 @@
 
 /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */
 
-extern char	*malloc (), *realloc ();
-
 unsigned long *
 Xalloc (amount)
     unsigned	amount;
--- vnc_unixsrc/Xvnc/include/Xpoll.h.old	2004-09-19 18:10:11.646953351 -0700
+++ vnc_unixsrc/Xvnc/include/Xpoll.h	2004-09-19 18:31:06.019245838 -0700
@@ -65,6 +65,8 @@
 #define NBBY	8		/* number of bits in a byte */
 #endif
 
+#define fds_bits __fds_bits
+
 #ifndef NFDBITS
 #define NFDBITS (sizeof(fd_mask) * NBBY)	/* bits per mask */
 #endif