aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-01-05 20:42:40 +0100
committermarha <marha@users.sourceforge.net>2014-01-05 20:42:40 +0100
commit7b4b94b4449aec056c4c92f5cacc2f89a292a80e (patch)
treeaa537bfd1819738dd606b5bfb97a5b094abf41f4
parent0fd65ec557757ec8760a96400a09b8a8a92a7b14 (diff)
downloadvcxsrv-7b4b94b4449aec056c4c92f5cacc2f89a292a80e.tar.gz
vcxsrv-7b4b94b4449aec056c4c92f5cacc2f89a292a80e.tar.bz2
vcxsrv-7b4b94b4449aec056c4c92f5cacc2f89a292a80e.zip
Synchronised files
-rw-r--r--gl/glx.h1
-rw-r--r--include/xcb/xcb.h6
-rw-r--r--libxcb/src/xcb.h4
3 files changed, 11 insertions, 0 deletions
diff --git a/gl/glx.h b/gl/glx.h
index 62d0ede9e..234abc050 100644
--- a/gl/glx.h
+++ b/gl/glx.h
@@ -168,6 +168,7 @@ typedef XID GLXDrawable;
/* GLX 1.3 and later */
typedef struct __GLXFBConfigRec *GLXFBConfig;
typedef XID GLXFBConfigID;
+typedef XID GLXContextID;
typedef XID GLXWindow;
typedef XID GLXPbuffer;
diff --git a/include/xcb/xcb.h b/include/xcb/xcb.h
index 6571ee693..18704c3f2 100644
--- a/include/xcb/xcb.h
+++ b/include/xcb/xcb.h
@@ -52,6 +52,12 @@ extern "C" {
* @file xcb.h
*/
+#ifdef _MSC_VER
+#define XCB_PACKED
+#else
+#define XCB_PACKED __attribute__((__packed__))
+#endif
+
/**
* @defgroup XCB_Core_API XCB Core API
* @brief Core API of the XCB library.
diff --git a/libxcb/src/xcb.h b/libxcb/src/xcb.h
index 1b32ccad6..18704c3f2 100644
--- a/libxcb/src/xcb.h
+++ b/libxcb/src/xcb.h
@@ -52,7 +52,11 @@ extern "C" {
* @file xcb.h
*/
+#ifdef _MSC_VER
+#define XCB_PACKED
+#else
#define XCB_PACKED __attribute__((__packed__))
+#endif
/**
* @defgroup XCB_Core_API XCB Core API