+2006-10-31 \e,bS\e(Bscar Fuentes <ofv@wanadoo.es> (tiny change)
+
+ * emacsclient.c [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
+ (close_winsock): Declare as __cdecl.
+
2006-10-31 Jan Dj\e,Ad\e(Brv <jan.h.d@swipnet.se>
* emacsclient.c [!WINDOWSNT]: Include <fcntl.h> if available.
#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
#ifdef WINDOWSNT
/* Wrapper to make WSACleanup a cdecl, as required by atexit(). */
-void close_winsock ()
+void __cdecl close_winsock ()
{
WSACleanup ();
}
#else
IOCTL (s, FIONBIO, &c_arg);
#endif
-#endif
+#endif
setsockopt (s, SOL_SOCKET, SO_LINGER, (char *) &l_arg, sizeof l_arg);
/*