libXmu is now a dll

Exported variables in libX11 and libxcb should be declared with
__declspec(dllimport)

12 files changed, 48 insertions, 16 deletions

diff --git a/libX11/include/X11/Xlibint.h b/libX11/include/X11/Xlibint.h
index 80edeec9a..84abd7319 100644
--- a/libX11/include/X11/Xlibint.h
+++ b/libX11/include/X11/Xlibint.h
@@ -272,29 +272,32 @@ struct _XLockPtrs {
 	);
 };
 
-#if defined(WIN32) && !defined(_XLIBINT_)
-#define _XCreateMutex_fn (*_XCreateMutex_fn_p)
-#define _XFreeMutex_fn (*_XFreeMutex_fn_p)
-#define _XLockMutex_fn (*_XLockMutex_fn_p)
-#define _XUnlockMutex_fn (*_XUnlockMutex_fn_p)
-#define _Xglobal_lock (*_Xglobal_lock_p)
+#ifdef WIN32
+#ifdef LIB11_DLL
+#define X11_EXTERN __declspec(dllexport) extern
+#else
+#define X11_EXTERN __declspec(dllimport) extern
 #endif
+#else
+#define X11_EXTERN extern
+#endif
+
 
 /* in XlibInt.c */
-extern void (*_XCreateMutex_fn)(
+X11_EXTERN void (*_XCreateMutex_fn)(
     LockInfoPtr /* lock */
 );
-extern void (*_XFreeMutex_fn)(
+X11_EXTERN void (*_XFreeMutex_fn)(
     LockInfoPtr /* lock */
 );
-extern void (*_XLockMutex_fn)(
+X11_EXTERN void (*_XLockMutex_fn)(
     LockInfoPtr	/* lock */
 #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
     , char * /* file */
     , int /* line */
 #endif
 );
-extern void (*_XUnlockMutex_fn)(
+X11_EXTERN void (*_XUnlockMutex_fn)(
     LockInfoPtr	/* lock */
 #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
     , char * /* file */
@@ -302,7 +305,7 @@ extern void (*_XUnlockMutex_fn)(
 #endif
 );
 
-extern LockInfoPtr _Xglobal_lock;
+X11_EXTERN LockInfoPtr _Xglobal_lock;
 
 #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
 #define LockDisplay(d)	     if ((d)->lock_fns) (*(d)->lock_fns->lock_display)((d),__FILE__,__LINE__)
@@ -872,10 +875,10 @@ extern int _XError(
 extern int _XIOError(
     Display*	/* dpy */
 ) _X_NORETURN;
-extern int (*_XIOErrorFunction)(
+X11_EXTERN int (*_XIOErrorFunction)(
     Display*	/* dpy */
 );
-extern int (*_XErrorFunction)(
+X11_EXTERN int (*_XErrorFunction)(
     Display*		/* dpy */,
     XErrorEvent*	/* error_event */
 );
diff --git a/libX11/libX11.def b/libX11/libX11.def
index cb0e0bedb..8d45bd6b0 100644
--- a/libX11/libX11.def
+++ b/libX11/libX11.def
@@ -11,8 +11,10 @@ EXPORTS
   _XGetBitsPerPixel

   _XGetRequest

   _XGetScanlinePad

+  _Xglobal_lock

   _Xglobal_lock_p

   _XInitImageFuncPtrs

+  _XLockMutex_fn

   _XLockMutex_fn_p

   _XRead

   _XReadPad

@@ -20,15 +22,18 @@ EXPORTS
   _XSend

   _XSetLastRequestRead

   _Xsetlocale

+  _XUnlockMutex_fn

   _XUnlockMutex_fn_p

   _XVIDtoVisual

   XAddConnectionWatch

   XAddExtension

   XAddHost

   XAllocColor

+  XAllocColorCells

   XAllocIconSize

   XAllocNamedColor

   XAllocSizeHints

+  XAllocStandardColormap

   XBell

   XChangeGC

   XChangeProperty

@@ -44,6 +49,7 @@ EXPORTS
   XCopyArea

   XCopyPlane

   XCreateBitmapFromData

+  XCreateColormap

   XCreateFontCursor

   XCreateFontSet

   XCreateGC

@@ -71,6 +77,7 @@ EXPORTS
   XDisplayName

   XDisplayOfIM

   XDisplayOfScreen

+  XDisplayString

   XDrawArc

   XDrawArcs

   XDrawImageString

@@ -110,6 +117,7 @@ EXPORTS
   XFlush

   XFontsOfFontSet

   XFree

+  XFreeColormap

   XFreeColors

   XFreeCursor

   XFreeFont

@@ -133,6 +141,7 @@ EXPORTS
   XGetInputFocus

   XGetKeyboardMapping

   XGetModifierMapping

+  XGetRGBColormaps

   XGetSelectionOwner

   XGetVisualInfo

   XGetWindowAttributes

@@ -276,6 +285,7 @@ EXPORTS
   XSetClipMask

   XSetClipOrigin

   XSetClipRectangles

+  XSetCloseDownMode

   XSetCommand

   XSetDashes

   XSetErrorHandler

@@ -293,6 +303,7 @@ EXPORTS
   XSetLocaleModifiers

   XSetPlaneMask

   XSetRegion

+  XSetRGBColormaps

   XSetSelectionOwner

   XSetStipple

   XSetSubwindowMode

@@ -308,6 +319,7 @@ EXPORTS
   XSetWMNormalHints

   XSetWMProperties

   XSetWMProtocols

+  XStoreColors

   XStoreName

   XStringToKeysym

   XSubtractRegion

@@ -331,6 +343,7 @@ EXPORTS
   Xutf8TextListToTextProperty

   Xutf8TextPropertyToTextList

   XVaCreateNestedList

+  XVisualIDFromVisual

   XwcDrawImageString

   XwcDrawString

   XwcFreeStringList

diff --git a/libX11/modules/im/ximcp/makefile b/libX11/modules/im/ximcp/makefile
index ca80ad90e..48ad05749 100644
--- a/libX11/modules/im/ximcp/makefile
+++ b/libX11/modules/im/ximcp/makefile
@@ -2,6 +2,8 @@ DEFINES += XIM_t TRANS_CLIENT
 
 LIBRARY=libximcp
 
+DEFINES += LIB11_DLL
+
 CSRCS = \
 	imCallbk.c \
 	imDefFlt.c \
diff --git a/libX11/modules/lc/Utf8/makefile b/libX11/modules/lc/Utf8/makefile
index 6f814c760..1dd942816 100644
--- a/libX11/modules/lc/Utf8/makefile
+++ b/libX11/modules/lc/Utf8/makefile
@@ -1,5 +1,7 @@
 LIBRARY = libxlcUTF8Load
 
+DEFINES += LIB11_DLL
+
 CSRCS=lcUTF8Load.c
 
 INCLUDES += ..\..\..\include\X11 ..\..\..\src\xlibi18n ..\..\..\src
diff --git a/libX11/modules/lc/def/makefile b/libX11/modules/lc/def/makefile
index b89ce455d..10a2f3521 100644
--- a/libX11/modules/lc/def/makefile
+++ b/libX11/modules/lc/def/makefile
@@ -1,5 +1,7 @@
 LIBRARY = libxlcDef
 CSRCS = lcDefConv.c
 
+DEFINES += LIB11_DLL
+
 INCLUDES += ..\..\..\include\X11 ..\..\..\src\xlibi18n ..\..\..\src
 
diff --git a/libX11/modules/lc/gen/makefile b/libX11/modules/lc/gen/makefile
index 8fe90a5e6..a06a39b01 100644
--- a/libX11/modules/lc/gen/makefile
+++ b/libX11/modules/lc/gen/makefile
@@ -1,5 +1,7 @@
 LIBRARY = liblcGenConvLoad
 
+DEFINES += LIB11_DLL
+
 CSRCS=lcGenConv.c
 
 INCLUDES += ..\..\..\include\X11 ..\..\..\src\xlibi18n ..\..\..\src
diff --git a/libX11/modules/lc/xlocale/makefile b/libX11/modules/lc/xlocale/makefile
index 9649982bd..42ca76b86 100644
--- a/libX11/modules/lc/xlocale/makefile
+++ b/libX11/modules/lc/xlocale/makefile
@@ -1,5 +1,7 @@
 LIBRARY = libxlocale
 
+DEFINES += LIB11_DLL
+
 CSRCS = \
 	lcEuc.c \
 	lcJis.c \
diff --git a/libX11/modules/om/generic/makefile b/libX11/modules/om/generic/makefile
index cb8e59dfe..14e7a8119 100644
--- a/libX11/modules/om/generic/makefile
+++ b/libX11/modules/om/generic/makefile
@@ -1,5 +1,7 @@
 LIBRARY = libxomGeneric
 
+DEFINES += LIB11_DLL
+
 CSRCS = \
 	omDefault.c \
 	omGeneric.c \
diff --git a/libX11/src/makefile b/libX11/src/makefile
index 4d74b854e..456ad4895 100644
--- a/libX11/src/makefile
+++ b/libX11/src/makefile
@@ -1,6 +1,7 @@
 LIBRARY=libx11
 
-DEFINES += X11_t TRANS_CLIENT
+DEFINES += X11_t TRANS_CLIENT LIB11_DLL
+
 
 CSRCS = \
                   AllCells.c \
diff --git a/libX11/src/xcms/makefile b/libX11/src/xcms/makefile
index 00fab124a..0ba42a246 100644
--- a/libX11/src/xcms/makefile
+++ b/libX11/src/xcms/makefile
@@ -1,6 +1,7 @@
 LIBRARY = libxcms
 
-DEFINES += HAVE_CONFIG_H
+DEFINES += HAVE_CONFIG_H LIB11_DLL
+
 
 CSRCS = \
 		  AddDIC.c \
diff --git a/libX11/src/xkb/Makefile b/libX11/src/xkb/Makefile
index 0f6b7e859..56aecc880 100644
--- a/libX11/src/xkb/Makefile
+++ b/libX11/src/xkb/Makefile
@@ -1,5 +1,7 @@
 LIBRARY = libxkb
 
+DEFINES += LIB11_DLL
+
 CSRCS = \
 	XKB.c \
 	XKBBind.c \
diff --git a/libX11/src/xlibi18n/makefile b/libX11/src/xlibi18n/makefile
index 5be81d350..d5dfcf723 100644
--- a/libX11/src/xlibi18n/makefile
+++ b/libX11/src/xlibi18n/makefile
@@ -44,7 +44,7 @@ LIBRARY = libi18n
 #	 $(IM_LIBS) $(LC_LIBS) $(OM_LIBS)
 
 INCLUDES += ..\..\include\X11
-DEFINES += XLOCALELIBDIR="\".\""
+DEFINES += XLOCALELIBDIR="\".\"" LIB11_DLL
 
 CSRCS = \
 	$(XI18N_DL_SOURCES) \