Index: client/audio.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/audio.c,v
retrieving revision 1.5
diff -u -r1.5 audio.c
--- client/audio.c	2002/05/14 19:40:39	1.5
+++ client/audio.c	2002/05/15 14:15:30
@@ -34,7 +34,7 @@
 #include "audio_sdl.h"
 #endif
 
-#ifdef AUDIO_WINMM
+#ifdef WINMM
 #include "audio_winmm.h"
 #endif
 
Index: client/audio_winmm.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/audio_winmm.c,v
retrieving revision 1.1
diff -u -r1.1 audio_winmm.c
--- client/audio_winmm.c	2002/04/25 12:32:50	1.1
+++ client/audio_winmm.c	2002/05/15 14:15:30
@@ -53,6 +53,7 @@
     return FALSE;
   }
   sndPlaySound(fullpath, SND_ASYNC | (repeat ? SND_LOOP : 0));
+  return TRUE;
 }
 
 /**************************************************************************
Index: client/civclient.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/civclient.c,v
retrieving revision 1.127
diff -u -r1.127 civclient.c
--- client/civclient.c	2002/05/03 16:35:07	1.127
+++ client/civclient.c	2002/05/15 14:15:30
@@ -27,6 +27,10 @@
 #include <sys/types.h>
 #endif
 
+#ifdef HAVE_WINSOCK
+#include <winsock.h>
+#endif
+
 #include "capstr.h"
 #include "fcintl.h"
 #include "game.h"
Index: common/support.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/support.c,v
retrieving revision 1.16
diff -u -r1.16 support.c
--- common/support.c	2002/02/11 10:38:06	1.16
+++ common/support.c	2002/05/15 14:15:31
@@ -403,7 +403,7 @@
 #ifdef WIN32_NATIVE
 static HANDLE mythread = INVALID_HANDLE_VALUE;
 
-static DWORD WINAPI thread_proc(LPVOID data)
+static unsigned int WINAPI thread_proc(LPVOID data)
 {
   if (fgets(mybuf, MYBUFSIZE, stdin)) {
     char *s;
Index: server/sernet.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/sernet.c,v
retrieving revision 1.90
diff -u -r1.90 sernet.c
--- server/sernet.c	2002/04/25 14:09:38	1.90
+++ server/sernet.c	2002/05/15 14:15:32
@@ -117,12 +117,13 @@
 /*****************************************************************************
   This happens if you type an EOF character with nothing on the current line.
 *****************************************************************************/
+#ifndef SOCKET_ZERO_ISNT_STDIN
 static void handle_stdin_close(void)
 {
   freelog(LOG_NORMAL, _("Server cannot read standard input. Ignoring input."));
   no_input = TRUE;
 }
-
+#endif
 #ifdef HAVE_LIBREADLINE
 /****************************************************************************/