Mercurial > emacs

changeset 73585:7d264c036b25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[WINDOWSNT]: Include <malloc.h> and <stdlib.h>. (close_winsock): Declare as __cdecl.
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 31 Oct 2006 16:39:15 +0000
parents e049c4ee04b1
children 50921825dc28
files lib-src/emacsclient.c
diffstat 1 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lib-src/emacsclient.c	Tue Oct 31 13:52:32 2006 +0000
+++ b/lib-src/emacsclient.c	Tue Oct 31 16:39:15 2006 +0000
@@ -27,29 +27,35 @@
 #endif
 
 #ifdef WINDOWSNT
-#define HAVE_SOCKETS
-#define NO_SOCKETS_IN_FILE_SYSTEM
-#endif
+
+# include <malloc.h>
+# include <stdlib.h>
 
-#ifdef WINDOWSNT
+# 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 ();
 }
@@ -497,7 +503,7 @@
 #else
   IOCTL (s, FIONBIO, &c_arg);
 #endif
-#endif 
+#endif
   setsockopt (s, SOL_SOCKET, SO_LINGER, (char *) &l_arg, sizeof l_arg);
 
   /*