From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu, 5 Jan 2012 20:57:52 +0000 (+0000)
Subject: Fix WIN32 compilation after commit 163c47bdc0d32785d831e4c93fea9ab7e023446b
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4aa7a2c849a9536febb2dc7773e06c12a69c5213;hp=769acff0da8b9859ebdf052dce80045465c7598c;p=free-sw%2Fxcb%2Flibxcb

Fix WIN32 compilation after commit 163c47bdc0d32785d831e4c93fea9ab7e023446b

WIN32 does not have arpa/inet.h, so do not try to include it unless _WIN32 is
not defined

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Julien Danjou <julien@danjou.info>
---

diff --git a/src/xcb_auth.c b/src/xcb_auth.c
index 859ab8a..21c26b8 100644
--- a/src/xcb_auth.c
+++ b/src/xcb_auth.c
@@ -30,7 +30,6 @@
 #include <sys/param.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <arpa/inet.h>
 
 #ifdef __INTERIX
 /* _don't_ ask. interix has INADDR_LOOPBACK in here. */
@@ -40,6 +39,7 @@
 #ifdef _WIN32
 #include "xcb_windefs.h"
 #else
+#include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/un.h>
diff --git a/src/xcb_util.c b/src/xcb_util.c
index a55df16..64a1f6d 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -34,11 +34,11 @@
 #include <stddef.h>
 #include <unistd.h>
 #include <string.h>
-#include <arpa/inet.h>
 
 #ifdef _WIN32
 #include "xcb_windefs.h"
 #else
+#include <arpa/inet.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>