diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-24 16:26:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-24 16:26:20 +0000 |
| commit | 82967ab5e087a2fdfcb984f990ba117da68a5b60 (patch) | |
| tree | 52ca72e09a0d1d0ecacfb51a8b0b5d1c8193449c /X11/Xwinsock.h | |
| parent | f02db4f3b9d748e1fd06e3ae2985b9cf1547cc7e (diff) | |
| parent | 67b353c9ce039b254ba2e92cd6f842c505a8bd21 (diff) | |
| download | vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.tar.gz vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.tar.bz2 vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released
Diffstat (limited to 'X11/Xwinsock.h')
| -rw-r--r-- | X11/Xwinsock.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/X11/Xwinsock.h b/X11/Xwinsock.h index 5cf062fbf..e6ca7b54b 100644 --- a/X11/Xwinsock.h +++ b/X11/Xwinsock.h @@ -1,4 +1,3 @@ -/* $Xorg: Xwinsock.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -36,8 +35,8 @@ The Open Group. #undef _XFree86Server #ifdef XFree86Server -#define _XFree86Server -#undef XFree86Server +# define _XFree86Server +# undef XFree86Server #endif #define BOOL wBOOL @@ -60,7 +59,7 @@ The Open Group. #undef RT_CURSOR #ifdef _XFree86Server -#define XFree86Server -#undef _XFree86Server +# define XFree86Server +# undef _XFree86Server #endif |