From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 13 Nov 2006 10:59:04 +0000 (+0000)
Subject: [WINDOWSNT]: Undef _WINSOCKAPI_ and _WINSOCK_H.
X-Git-Tag: emacs-pretest-22.0.91~86
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc28de715d58aa574f93a5a2a28a72ca8bb724dc;p=emacs.git

[WINDOWSNT]: Undef _WINSOCKAPI_ and _WINSOCK_H.
---

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 7cf703d40d1..a22fd1a8133 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -28,10 +28,17 @@ Boston, MA 02110-1301, USA.  */
 
 #ifdef WINDOWSNT
 
+/* config.h defines these, which disables sockets altogether! */
+# undef _WINSOCKAPI_
+# undef _WINSOCK_H
+
 # include <malloc.h>
 # include <stdlib.h>
 
-# define HAVE_SOCKETS
+# ifndef HAVE_SOCKETS
+#  define HAVE_SOCKETS
+# endif
+
 # define HAVE_INET_SOCKETS
 # define NO_SOCKETS_IN_FILE_SYSTEM