[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      06/10/31 16:39:15

Index: emacsclient.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- emacsclient.c       31 Oct 2006 13:50:35 -0000      1.80
+++ emacsclient.c       31 Oct 2006 16:39:15 -0000      1.81
@@ -27,29 +27,35 @@
 #endif
 
 #ifdef WINDOWSNT
-#define HAVE_SOCKETS
-#define NO_SOCKETS_IN_FILE_SYSTEM
-#endif
 
-#ifdef WINDOWSNT
+# include <malloc.h>
+# include <stdlib.h>
+
+# define HAVE_SOCKETS
+# define NO_SOCKETS_IN_FILE_SYSTEM
+
 # define HSOCKET SOCKET
 # define CLOSE_SOCKET closesocket
 # define IOCTL ioctlsocket
 # define INITIALIZE() (initialize_sockets ())
 typedef unsigned long IOCTL_BOOL_ARG;
-#else
+
+#else /* !WINDOWSNT */
+
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
 # include <netinet/in.h>
 # include <sys/ioctl.h>
+
 # define INVALID_SOCKET -1
 # define HSOCKET int
 # define CLOSE_SOCKET close
 # define IOCTL ioctl
 # define INITIALIZE()
 typedef int IOCTL_BOOL_ARG;
-#endif
+
+#endif /* !WINDOWSNT */
 
 #undef signal
 
@@ -379,7 +385,7 @@
 
 #ifdef WINDOWSNT
 /* Wrapper to make WSACleanup a cdecl, as required by atexit().         */
-void close_winsock ()
+void __cdecl close_winsock ()
 {
   WSACleanup ();
 }