aboutsummaryrefslogtreecommitdiff
path: root/libX11
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-09-03 14:16:57 +0000
committermarha <marha@users.sourceforge.net>2010-09-03 14:16:57 +0000
commit618c64aa88755d61b734ba8b54a325a56ac830ad (patch)
treeaf63069a8597de2b1a190d18a62ebe3ce752cd02 /libX11
parent917506f14358fb7ceb85e1b769c98951dccc9dd9 (diff)
downloadvcxsrv-618c64aa88755d61b734ba8b54a325a56ac830ad.tar.gz
vcxsrv-618c64aa88755d61b734ba8b54a325a56ac830ad.tar.bz2
vcxsrv-618c64aa88755d61b734ba8b54a325a56ac830ad.zip
Synchronised glx with mesa
Diffstat (limited to 'libX11')
-rw-r--r--libX11/include/X11/Xregion.h2
-rw-r--r--libX11/src/config.h4
-rw-r--r--libX11/src/xlibi18n/XimProto.h7
3 files changed, 13 insertions, 0 deletions
diff --git a/libX11/include/X11/Xregion.h b/libX11/include/X11/Xregion.h
index 7b376e556..31199688c 100644
--- a/libX11/include/X11/Xregion.h
+++ b/libX11/include/X11/Xregion.h
@@ -58,8 +58,10 @@ typedef struct {
#define TRUE 1
#define FALSE 0
+#ifndef MAXSHORT
#define MAXSHORT 32767
#define MINSHORT -MAXSHORT
+#endif
#ifndef MAX
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
diff --git a/libX11/src/config.h b/libX11/src/config.h
index d69d83cb9..abbac6e3b 100644
--- a/libX11/src/config.h
+++ b/libX11/src/config.h
@@ -237,3 +237,7 @@
/* Support gzip for bitmap fonts */
#define X_GZIP_FONT_COMPRESSION 1
+
+#define INCL_WINSOCK_API_TYPEDEFS 1
+#include <X11/Xwinsock.h>
+#include <X11/Xwindows.h>
diff --git a/libX11/src/xlibi18n/XimProto.h b/libX11/src/xlibi18n/XimProto.h
index 6b0096dd6..9551301a2 100644
--- a/libX11/src/xlibi18n/XimProto.h
+++ b/libX11/src/xlibi18n/XimProto.h
@@ -143,6 +143,13 @@ PERFORMANCE OF THIS SOFTWARE.
/*
* byte order
*/
+#ifdef BIGENDIAN
+#undef BIGENDIAN
+#endif
+#ifdef LITTLEENDIAN
+#undef LITTLEENDIAN
+#endif
+
#define BIGENDIAN (CARD8)0x42 /* MSB first */
#define LITTLEENDIAN (CARD8)0x6c /* LSB first */