diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-06 18:48:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-06 18:48:27 +0000 |
| commit | a915739887477b28d924ecc8417ee107d125bd6c (patch) | |
| tree | c02f315476b61892d1fd89182e18943dce8d6277 /xorg-server/hw/xwin/winclipboard.h | |
| parent | 6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff) | |
| download | vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.tar.gz vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.tar.bz2 vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.zip | |
Switched to xorg-server-1.6.99.900.tar.gz
Diffstat (limited to 'xorg-server/hw/xwin/winclipboard.h')
| -rw-r--r-- | xorg-server/hw/xwin/winclipboard.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/xorg-server/hw/xwin/winclipboard.h b/xorg-server/hw/xwin/winclipboard.h index 445c01b27..089c2913b 100644 --- a/xorg-server/hw/xwin/winclipboard.h +++ b/xorg-server/hw/xwin/winclipboard.h @@ -38,7 +38,7 @@ #ifdef __CYGWIN__ #include <sys/select.h> #else -#include "Xwinsock.h" +#include <X11/Xwinsock.h> #define HAS_WINSOCK #endif #include <fcntl.h> @@ -48,27 +48,12 @@ /* X headers */ #include <X11/X.h> #include <X11/Xatom.h> -/* NOTE: For some unknown reason, including Xproto.h solves - * tons of problems with including windows.h. Unknowns reasons - * are usually bad, so someone should investigate this. - */ #include <X11/Xproto.h> -#include "X11/Xutil.h" -#include "X11/Xlocale.h" - -/* Fixups to prevent collisions between Windows and X headers */ -#define ATOM DWORD - -#ifndef __CYGWIN__ -#define sleep(x) Sleep (1000 * (x)) -#endif +#include <X11/Xutil.h> +#include <X11/Xlocale.h> /* Windows headers */ -#ifndef XFree86Server -#define XFree86Server -#endif -#include <windows.h> -#undef XFree86Server +#include <X11/Xwindows.h> /* Clipboard module constants */ |