summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Pavlik <rpavlik@iastate.edu>2011-11-04 13:17:50 -0500
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-01-07 22:50:17 +0000
commitc763fe51b8ff18e204caab9cf97376a1b72324f0 (patch)
tree4c830cdc34bbd3d0046fb27c75e2b7b286e52c10
parent3d80f202b06227f7fc03b674f5fbf809c2d1efb2 (diff)
hw/xwin: Fix duplicate definition of HAS_WINSOCK when building for MinGW
hw/xwin: Fix duplicate definition of HAS_WINSOCK when building for MinGW but still provide it if building for Win32 without autotools xserver/hw/xwin/winclipboard.h:42:0: warning: "HAS_WINSOCK" redefined ../../include/xwin-config.h:11:0: note: this is the location of the previous definition Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
-rw-r--r--hw/xwin/winclipboard.h1
-rw-r--r--hw/xwin/winclipboardthread.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/xwin/winclipboard.h b/hw/xwin/winclipboard.h
index 089c2913b..6b5249fd1 100644
--- a/hw/xwin/winclipboard.h
+++ b/hw/xwin/winclipboard.h
@@ -39,7 +39,6 @@
#include <sys/select.h>
#else
#include <X11/Xwinsock.h>
-#define HAS_WINSOCK
#endif
#include <fcntl.h>
#include <setjmp.h>
diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c
index e7df4527e..908dfcea2 100644
--- a/hw/xwin/winclipboardthread.c
+++ b/hw/xwin/winclipboardthread.c
@@ -32,6 +32,8 @@
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
+#else
+#define HAS_WINSOCK 1
#endif
#include <sys/types.h>
#include "winclipboard.h"