aboutsummaryrefslogtreecommitdiff
path: root/libxcb/src
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 /libxcb/src
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 'libxcb/src')
-rw-r--r--libxcb/src/makefile2
-rw-r--r--libxcb/src/xcb.h1
-rw-r--r--libxcb/src/xcb_windefs.h6
3 files changed, 8 insertions, 1 deletions
diff --git a/libxcb/src/makefile b/libxcb/src/makefile
index 5b63df63a..3dc8d38e5 100644
--- a/libxcb/src/makefile
+++ b/libxcb/src/makefile
@@ -4,7 +4,7 @@ CSRCS = \
xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
xcb_list.c xcb_util.c xcb_auth.c
-DEFINES += PTW32_STATIC_LIB HAVE_GETADDRINFO
+DEFINES += PTW32_STATIC_LIB HAVE_GETADDRINFO LIBXCB_DLL
INCLUDELIBFILES = \
$(MHMAKECONF)\libxau\$(OBJDIR)\libXau.lib
diff --git a/libxcb/src/xcb.h b/libxcb/src/xcb.h
index 44f650ad7..242e50903 100644
--- a/libxcb/src/xcb.h
+++ b/libxcb/src/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/libxcb/src/xcb_windefs.h b/libxcb/src/xcb_windefs.h
index 9789735f2..5f43c9c96 100644
--- a/libxcb/src/xcb_windefs.h
+++ b/libxcb/src/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 */