aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-27 09:14:14 +0200
committermarha <marha@users.sourceforge.net>2012-06-27 09:14:14 +0200
commit392bc11a81b5fe8c8a340eae23ffa3c5c06b72e7 (patch)
treee4db977508f3e38e79ed5d06523eda5d8f9a6397 /include
parentd02cf3cc6e0989aace77a47a56979d1f21d33724 (diff)
downloadvcxsrv-392bc11a81b5fe8c8a340eae23ffa3c5c06b72e7.tar.gz
vcxsrv-392bc11a81b5fe8c8a340eae23ffa3c5c06b72e7.tar.bz2
vcxsrv-392bc11a81b5fe8c8a340eae23ffa3c5c06b72e7.zip
libXmu is now a dll
Exported variables in libX11 and libxcb should be declared with __declspec(dllimport)
Diffstat (limited to 'include')
-rw-r--r--include/xcb/bigreq.h2
-rw-r--r--include/xcb/render.h2
-rw-r--r--include/xcb/shape.h2
-rw-r--r--include/xcb/xc_misc.h2
-rw-r--r--include/xcb/xcb.h1
-rw-r--r--include/xcb/xcb_windefs.h6
6 files changed, 11 insertions, 4 deletions
diff --git a/include/xcb/bigreq.h b/include/xcb/bigreq.h
index a9888331a..208874bb5 100644
--- a/include/xcb/bigreq.h
+++ b/include/xcb/bigreq.h
@@ -21,7 +21,7 @@ extern "C" {
#define XCB_BIGREQUESTS_MAJOR_VERSION 0
#define XCB_BIGREQUESTS_MINOR_VERSION 0
-extern xcb_extension_t xcb_big_requests_id;
+XCB_EXTERN xcb_extension_t xcb_big_requests_id;
/**
* @brief xcb_big_requests_enable_cookie_t
diff --git a/include/xcb/render.h b/include/xcb/render.h
index 8e05c39d1..3242c11a5 100644
--- a/include/xcb/render.h
+++ b/include/xcb/render.h
@@ -22,7 +22,7 @@ extern "C" {
#define XCB_RENDER_MAJOR_VERSION 0
#define XCB_RENDER_MINOR_VERSION 11
-extern xcb_extension_t xcb_render_id;
+XCB_EXTERN xcb_extension_t xcb_render_id;
typedef enum xcb_render_pict_type_t {
XCB_RENDER_PICT_TYPE_INDEXED,
diff --git a/include/xcb/shape.h b/include/xcb/shape.h
index 059887a08..cafe42ffb 100644
--- a/include/xcb/shape.h
+++ b/include/xcb/shape.h
@@ -22,7 +22,7 @@ extern "C" {
#define XCB_SHAPE_MAJOR_VERSION 1
#define XCB_SHAPE_MINOR_VERSION 1
-extern xcb_extension_t xcb_shape_id;
+XCB_EXTERN xcb_extension_t xcb_shape_id;
typedef uint8_t xcb_shape_op_t;
diff --git a/include/xcb/xc_misc.h b/include/xcb/xc_misc.h
index 69cf64705..319db27a1 100644
--- a/include/xcb/xc_misc.h
+++ b/include/xcb/xc_misc.h
@@ -21,7 +21,7 @@ extern "C" {
#define XCB_XCMISC_MAJOR_VERSION 1
#define XCB_XCMISC_MINOR_VERSION 1
-extern xcb_extension_t xcb_xc_misc_id;
+XCB_EXTERN xcb_extension_t xcb_xc_misc_id;
/**
* @brief xcb_xc_misc_get_version_cookie_t
diff --git a/include/xcb/xcb.h b/include/xcb/xcb.h
index 44f650ad7..242e50903 100644
--- a/include/xcb/xcb.h
+++ b/include/xcb/xcb.h
@@ -37,6 +37,7 @@
#ifndef _WIN32
#include <sys/uio.h>
+#define XCB_EXTERN extern
#else
#include "xcb_windefs.h"
#endif
diff --git a/include/xcb/xcb_windefs.h b/include/xcb/xcb_windefs.h
index 9789735f2..5f43c9c96 100644
--- a/include/xcb/xcb_windefs.h
+++ b/include/xcb/xcb_windefs.h
@@ -49,4 +49,10 @@ typedef int pid_t;
#define STDERR_FILENO 2
+#ifdef LIBXCB_DLL
+#define XCB_EXTERN __declspec(dllexport) extern
+#else
+#define XCB_EXTERN __declspec(dllimport) extern
+#endif
+
#endif /* xcb_windefs.h */