From 7b4b94b4449aec056c4c92f5cacc2f89a292a80e Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 5 Jan 2014 20:42:40 +0100 Subject: Synchronised files --- gl/glx.h | 1 + include/xcb/xcb.h | 6 ++++++ libxcb/src/xcb.h | 4 ++++ 3 files changed, 11 insertions(+) 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 -- cgit v1.2.3