frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ryan Pavlik 2011-11-04 13:17:50 -05:00 committed by Jon TURNEY
parent 3d80f202b0
commit c763fe51b8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwin/winclipboard.h
View File

@ -39,7 +39,6 @@
#include <sys/select.h>
#else
#include <X11/Xwinsock.h>
#define HAS_WINSOCK
#endif
#include <fcntl.h>
#include <setjmp.h>

2
hw/xwin/winclipboardthread.c
View File

@ -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"