[PATCH app/xhost 1/4] Use Xwinsock.h on WIN32

Jon TURNEY jon.turney at dronecode.org.uk
Fri Feb 15 08:08:37 PST 2013


Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 xhost.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/xhost.c b/xhost.c
index 69d2a41..93f4575 100644
--- a/xhost.c
+++ b/xhost.c
@@ -91,6 +91,9 @@ typedef long sign32;
 #include <interlan/netdb.h>
 #include <interlan/in.h>
 #else
+#ifdef WIN32
+#include <X11/Xwinsock.h>
+#else
 #ifndef Lynx
 #include <sys/socket.h>
 #else
@@ -99,14 +102,17 @@ typedef long sign32;
 #include <netdb.h>
 #include <netinet/in.h>
 #endif
+#endif
 #endif /* NEEDSOCKETS */
 
+#ifndef WIN32
 #ifndef BAD_ARPAINET
 #include <arpa/inet.h>
 #else
 /* bogus definition of inet_makeaddr() in BSD 4.2 and Ultrix */
 extern unsigned long inet_makeaddr();
 #endif
+#endif
 
 
 #ifdef SECURE_RPC
-- 
1.7.9



More information about the xorg-devel mailing list