dix: Unexport various implementation details

Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>

6 files changed, 175 insertions, 225 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 738b582e9..70b83ffec 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -52,8 +52,6 @@ sdk_HEADERS =		\
 	selection.h	\
 	servermd.h	\
 	site.h		\
-	swaprep.h	\
-	swapreq.h	\
 	validate.h	\
 	window.h	\
 	windowstr.h	\
@@ -74,5 +72,7 @@ EXTRA_DIST = 	\
 	dixfontstubs.h eventconvert.h eventstr.h inpututils.h \
 	probes.h \
 	protocol-versions.h \
+	swaprep.h \
+	swapreq.h \
 	systemd-logind.h \
 	xsha1.h
diff --git a/include/colormap.h b/include/colormap.h
index 5f6b97fec..f3b18a613 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -108,18 +108,6 @@ extern _X_EXPORT void FakeAllocColor(ColormapPtr /*pmap */ ,
 extern _X_EXPORT void FakeFreeColor(ColormapPtr /*pmap */ ,
                                     Pixel /*pixel */ );
 
-typedef int (*ColorCompareProcPtr) (EntryPtr /*pent */ ,
-                                    xrgb * /*prgb */ );
-
-extern _X_EXPORT int FindColor(ColormapPtr /*pmap */ ,
-                               EntryPtr /*pentFirst */ ,
-                               int /*size */ ,
-                               xrgb * /*prgb */ ,
-                               Pixel * /*pPixel */ ,
-                               int /*channel */ ,
-                               int /*client */ ,
-                               ColorCompareProcPtr /*comp */ );
-
 extern _X_EXPORT int QueryColors(ColormapPtr /*pmap */ ,
                                  int /*count */ ,
                                  Pixel * /*ppixIn */ ,
diff --git a/include/dixfont.h b/include/dixfont.h
index 48c630539..1895509b3 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -36,14 +36,6 @@ typedef struct _DIXFontProp *DIXFontPropPtr;
 
 extern _X_EXPORT Bool SetDefaultFont(const char * /*defaultfontname */ );
 
-extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ );
-
-extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe */ );
-
-extern _X_EXPORT void FontWakeup(void *data,
-                                 int count,
-                                 void *LastSelectMask);
-
 extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
                               XID /*fid */ ,
                               Mask /*flags */ ,
@@ -64,14 +56,6 @@ extern _X_EXPORT int ListFonts(ClientPtr /*client */ ,
                                unsigned int /*length */ ,
                                unsigned int /*max_names */ );
 
-extern _X_EXPORT int
- doListFontsWithInfo(ClientPtr /*client */ ,
-                     LFWIclosurePtr /*c */ );
-
-extern _X_EXPORT int doPolyText(ClientPtr /*client */ ,
-                                PTclosurePtr    /*c */
-    );
-
 extern _X_EXPORT int PolyText(ClientPtr /*client */ ,
                               DrawablePtr /*pDraw */ ,
                               GCPtr /*pGC */ ,
@@ -82,9 +66,6 @@ extern _X_EXPORT int PolyText(ClientPtr /*client */ ,
                               int /*reqType */ ,
                               XID /*did */ );
 
-extern _X_EXPORT int doImageText(ClientPtr /*client */ ,
-                                 ITclosurePtr /*c */ );
-
 extern _X_EXPORT int ImageText(ClientPtr /*client */ ,
                                DrawablePtr /*pDraw */ ,
                                GCPtr /*pGC */ ,
@@ -126,22 +107,6 @@ extern _X_EXPORT void dixGetGlyphs(FontPtr /*font */ ,
                                    unsigned long * /*glyphcount */ ,
                                    CharInfoPtr * /*glyphs */ );
 
-extern _X_EXPORT void QueryGlyphExtents(FontPtr /*pFont */ ,
-                                        CharInfoPtr * /*charinfo */ ,
-                                        unsigned long /*count */ ,
-                                        ExtentInfoPtr /*info */ );
-
-extern _X_EXPORT Bool QueryTextExtents(FontPtr /*pFont */ ,
-                                       unsigned long /*count */ ,
-                                       unsigned char * /*chars */ ,
-                                       ExtentInfoPtr /*info */ );
-
-extern _X_EXPORT Bool ParseGlyphCachingMode(char * /*str */ );
-
-extern _X_EXPORT void InitGlyphCaching(void);
-
-extern _X_EXPORT void SetGlyphCachingMode(int /*newmode */ );
-
 extern _X_EXPORT void register_fpe_functions(void);
 
 #endif                          /* DIXFONT_H */
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 6c13895d7..757506623 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -126,21 +126,18 @@ SetReqFds(ClientPtr client, int req_fds) {
 /*
  * Scheduling interface
  */
-extern _X_EXPORT long SmartScheduleTime;
-extern _X_EXPORT long SmartScheduleInterval;
-extern _X_EXPORT long SmartScheduleSlice;
-extern _X_EXPORT long SmartScheduleMaxSlice;
-extern _X_EXPORT Bool SmartScheduleDisable;
-extern _X_EXPORT void
-SmartScheduleStartTimer(void);
-extern _X_EXPORT void
-SmartScheduleStopTimer(void);
+extern long SmartScheduleTime;
+extern long SmartScheduleInterval;
+extern long SmartScheduleSlice;
+extern long SmartScheduleMaxSlice;
+extern Bool SmartScheduleDisable;
+extern void SmartScheduleStartTimer(void);
+extern void SmartScheduleStopTimer(void);
 
 #define SMART_MAX_PRIORITY  (20)
 #define SMART_MIN_PRIORITY  (-20)
 
-extern _X_EXPORT void
-SmartScheduleInit(void);
+extern void SmartScheduleInit(void);
 
 /* This prototype is used pervasively in Xext, dix */
 #define DISPATCH_PROC(func) int func(ClientPtr /* client */)
@@ -179,13 +176,13 @@ typedef struct _CallbackList {
 
 /* proc vectors */
 
-extern _X_EXPORT int (*InitialVector[3]) (ClientPtr /*client */ );
+extern int (*InitialVector[3]) (ClientPtr /*client */ );
 
 extern _X_EXPORT int (*ProcVector[256]) (ClientPtr /*client */ );
 
 extern _X_EXPORT int (*SwappedProcVector[256]) (ClientPtr /*client */ );
 
-extern _X_EXPORT ReplySwapPtr ReplySwapVector[256];
+extern ReplySwapPtr ReplySwapVector[256];
 
 extern _X_EXPORT int
 ProcBadRequest(ClientPtr /*client */ );
diff --git a/include/swaprep.h b/include/swaprep.h
index 3fa2a090c..63c54c7fb 100644
--- a/include/swaprep.h
+++ b/include/swaprep.h
@@ -26,207 +26,207 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef SWAPREP_H
 #define SWAPREP_H 1
 
-extern _X_EXPORT void Swap32Write(ClientPtr /* pClient */ ,
-                                  int /* size */ ,
-                                  CARD32 * /* pbuf */ );
+extern void Swap32Write(ClientPtr /* pClient */ ,
+                        int /* size */ ,
+                        CARD32 * /* pbuf */ );
 
-extern _X_EXPORT void CopySwap32Write(ClientPtr /* pClient */ ,
-                                      int /* size */ ,
-                                      CARD32 * /* pbuf */ );
+extern void CopySwap32Write(ClientPtr /* pClient */ ,
+                            int /* size */ ,
+                            CARD32 * /* pbuf */ );
+
+extern void CopySwap16Write(ClientPtr /* pClient */ ,
+                            int /* size */ ,
+                            short * /* pbuf */ );
+
+extern void SGenericReply(ClientPtr /* pClient */ ,
+                          int /* size */ ,
+                          xGenericReply * /* pRep */ );
 
-extern _X_EXPORT void CopySwap16Write(ClientPtr /* pClient */ ,
+extern void SGetWindowAttributesReply(ClientPtr /* pClient */ ,
                                       int /* size */ ,
-                                      short * /* pbuf */ );
+                                      xGetWindowAttributesReply *
+                                      /* pRep */ );
+
+extern void SGetGeometryReply(ClientPtr /* pClient */ ,
+                              int /* size */ ,
+                              xGetGeometryReply * /* pRep */ );
+
+extern void SQueryTreeReply(ClientPtr /* pClient */ ,
+                            int /* size */ ,
+                            xQueryTreeReply * /* pRep */ );
+
+extern void SInternAtomReply(ClientPtr /* pClient */ ,
+                             int /* size */ ,
+                             xInternAtomReply * /* pRep */ );
+
+extern void SGetAtomNameReply(ClientPtr /* pClient */ ,
+                              int /* size */ ,
+                              xGetAtomNameReply * /* pRep */ );
 
-extern _X_EXPORT void SGenericReply(ClientPtr /* pClient */ ,
+extern void SGetPropertyReply(ClientPtr /* pClient */ ,
+                              int /* size */ ,
+                              xGetPropertyReply * /* pRep */ );
+
+extern void SListPropertiesReply(ClientPtr /* pClient */ ,
+                                 int /* size */ ,
+                                 xListPropertiesReply * /* pRep */ );
+
+extern void SGetSelectionOwnerReply(ClientPtr /* pClient */ ,
                                     int /* size */ ,
-                                    xGenericReply * /* pRep */ );
+                                    xGetSelectionOwnerReply *
+                                    /* pRep */ );
 
-extern _X_EXPORT void SGetWindowAttributesReply(ClientPtr /* pClient */ ,
-                                                int /* size */ ,
-                                                xGetWindowAttributesReply *
-                                                /* pRep */ );
+extern void SQueryPointerReply(ClientPtr /* pClient */ ,
+                               int /* size */ ,
+                               xQueryPointerReply * /* pRep */ );
 
-extern _X_EXPORT void SGetGeometryReply(ClientPtr /* pClient */ ,
-                                        int /* size */ ,
-                                        xGetGeometryReply * /* pRep */ );
+extern void SwapTimeCoordWrite(ClientPtr /* pClient */ ,
+                               int /* size */ ,
+                               xTimecoord * /* pRep */ );
 
-extern _X_EXPORT void SQueryTreeReply(ClientPtr /* pClient */ ,
-                                      int /* size */ ,
-                                      xQueryTreeReply * /* pRep */ );
+extern void SGetMotionEventsReply(ClientPtr /* pClient */ ,
+                                  int /* size */ ,
+                                  xGetMotionEventsReply *       /* pRep */
+    );
 
-extern _X_EXPORT void SInternAtomReply(ClientPtr /* pClient */ ,
-                                       int /* size */ ,
-                                       xInternAtomReply * /* pRep */ );
+extern void STranslateCoordsReply(ClientPtr /* pClient */ ,
+                                  int /* size */ ,
+                                  xTranslateCoordsReply *       /* pRep */
+    );
 
-extern _X_EXPORT void SGetAtomNameReply(ClientPtr /* pClient */ ,
-                                        int /* size */ ,
-                                        xGetAtomNameReply * /* pRep */ );
+extern void SGetInputFocusReply(ClientPtr /* pClient */ ,
+                                int /* size */ ,
+                                xGetInputFocusReply * /* pRep */ );
 
-extern _X_EXPORT void SGetPropertyReply(ClientPtr /* pClient */ ,
-                                        int /* size */ ,
-                                        xGetPropertyReply * /* pRep */ );
+extern void SQueryKeymapReply(ClientPtr /* pClient */ ,
+                              int /* size */ ,
+                              xQueryKeymapReply * /* pRep */ );
 
-extern _X_EXPORT void SListPropertiesReply(ClientPtr /* pClient */ ,
-                                           int /* size */ ,
-                                           xListPropertiesReply * /* pRep */ );
+extern void SQueryFontReply(ClientPtr /* pClient */ ,
+                            int /* size */ ,
+                            xQueryFontReply * /* pRep */ );
 
-extern _X_EXPORT void SGetSelectionOwnerReply(ClientPtr /* pClient */ ,
-                                              int /* size */ ,
-                                              xGetSelectionOwnerReply *
-                                              /* pRep */ );
+extern void SQueryTextExtentsReply(ClientPtr /* pClient */ ,
+                                   int /* size */ ,
+                                   xQueryTextExtentsReply *     /* pRep */
+    );
 
-extern _X_EXPORT void SQueryPointerReply(ClientPtr /* pClient */ ,
-                                         int /* size */ ,
-                                         xQueryPointerReply * /* pRep */ );
+extern void SListFontsReply(ClientPtr /* pClient */ ,
+                            int /* size */ ,
+                            xListFontsReply * /* pRep */ );
 
-extern _X_EXPORT void SwapTimeCoordWrite(ClientPtr /* pClient */ ,
-                                         int /* size */ ,
-                                         xTimecoord * /* pRep */ );
+extern void SListFontsWithInfoReply(ClientPtr /* pClient */ ,
+                                    int /* size */ ,
+                                    xListFontsWithInfoReply *
+                                    /* pRep */ );
 
-extern _X_EXPORT void SGetMotionEventsReply(ClientPtr /* pClient */ ,
-                                            int /* size */ ,
-                                            xGetMotionEventsReply * /* pRep */
-                                            );
+extern void SGetFontPathReply(ClientPtr /* pClient */ ,
+                              int /* size */ ,
+                              xGetFontPathReply * /* pRep */ );
 
-extern _X_EXPORT void STranslateCoordsReply(ClientPtr /* pClient */ ,
-                                            int /* size */ ,
-                                            xTranslateCoordsReply * /* pRep */
-                                            );
+extern void SGetImageReply(ClientPtr /* pClient */ ,
+                           int /* size */ ,
+                           xGetImageReply * /* pRep */ );
 
-extern _X_EXPORT void SGetInputFocusReply(ClientPtr /* pClient */ ,
-                                          int /* size */ ,
-                                          xGetInputFocusReply * /* pRep */ );
+extern void SListInstalledColormapsReply(ClientPtr /* pClient */ ,
+                                         int /* size */ ,
+                                         xListInstalledColormapsReply
+                                         * /* pRep */ );
 
-extern _X_EXPORT void SQueryKeymapReply(ClientPtr /* pClient */ ,
-                                        int /* size */ ,
-                                        xQueryKeymapReply * /* pRep */ );
+extern void SAllocColorReply(ClientPtr /* pClient */ ,
+                             int /* size */ ,
+                             xAllocColorReply * /* pRep */ );
 
-extern _X_EXPORT void SQueryFontReply(ClientPtr /* pClient */ ,
-                                      int /* size */ ,
-                                      xQueryFontReply * /* pRep */ );
+extern void SAllocNamedColorReply(ClientPtr /* pClient */ ,
+                                  int /* size */ ,
+                                  xAllocNamedColorReply *       /* pRep */
+    );
 
-extern _X_EXPORT void SQueryTextExtentsReply(ClientPtr /* pClient */ ,
-                                             int /* size */ ,
-                                             xQueryTextExtentsReply * /* pRep */
-                                             );
+extern void SAllocColorCellsReply(ClientPtr /* pClient */ ,
+                                  int /* size */ ,
+                                  xAllocColorCellsReply *       /* pRep */
+    );
 
-extern _X_EXPORT void SListFontsReply(ClientPtr /* pClient */ ,
-                                      int /* size */ ,
-                                      xListFontsReply * /* pRep */ );
+extern void SAllocColorPlanesReply(ClientPtr /* pClient */ ,
+                                   int /* size */ ,
+                                   xAllocColorPlanesReply *     /* pRep */
+    );
 
-extern _X_EXPORT void SListFontsWithInfoReply(ClientPtr /* pClient */ ,
-                                              int /* size */ ,
-                                              xListFontsWithInfoReply *
-                                              /* pRep */ );
+extern void SQColorsExtend(ClientPtr /* pClient */ ,
+                           int /* size */ ,
+                           xrgb * /* prgb */ );
 
-extern _X_EXPORT void SGetFontPathReply(ClientPtr /* pClient */ ,
-                                        int /* size */ ,
-                                        xGetFontPathReply * /* pRep */ );
+extern void SQueryColorsReply(ClientPtr /* pClient */ ,
+                              int /* size */ ,
+                              xQueryColorsReply * /* pRep */ );
 
-extern _X_EXPORT void SGetImageReply(ClientPtr /* pClient */ ,
-                                     int /* size */ ,
-                                     xGetImageReply * /* pRep */ );
+extern void SLookupColorReply(ClientPtr /* pClient */ ,
+                              int /* size */ ,
+                              xLookupColorReply * /* pRep */ );
 
-extern _X_EXPORT void SListInstalledColormapsReply(ClientPtr /* pClient */ ,
-                                                   int /* size */ ,
-                                                   xListInstalledColormapsReply
-                                                   * /* pRep */ );
+extern void SQueryBestSizeReply(ClientPtr /* pClient */ ,
+                                int /* size */ ,
+                                xQueryBestSizeReply * /* pRep */ );
 
-extern _X_EXPORT void SAllocColorReply(ClientPtr /* pClient */ ,
-                                       int /* size */ ,
-                                       xAllocColorReply * /* pRep */ );
+extern void SListExtensionsReply(ClientPtr /* pClient */ ,
+                                 int /* size */ ,
+                                 xListExtensionsReply * /* pRep */ );
 
-extern _X_EXPORT void SAllocNamedColorReply(ClientPtr /* pClient */ ,
-                                            int /* size */ ,
-                                            xAllocNamedColorReply * /* pRep */
-                                            );
+extern void SGetKeyboardMappingReply(ClientPtr /* pClient */ ,
+                                     int /* size */ ,
+                                     xGetKeyboardMappingReply *
+                                     /* pRep */ );
 
-extern _X_EXPORT void SAllocColorCellsReply(ClientPtr /* pClient */ ,
-                                            int /* size */ ,
-                                            xAllocColorCellsReply * /* pRep */
-                                            );
+extern void SGetPointerMappingReply(ClientPtr /* pClient */ ,
+                                    int /* size */ ,
+                                    xGetPointerMappingReply *
+                                    /* pRep */ );
 
-extern _X_EXPORT void SAllocColorPlanesReply(ClientPtr /* pClient */ ,
-                                             int /* size */ ,
-                                             xAllocColorPlanesReply * /* pRep */
-                                             );
+extern void SGetModifierMappingReply(ClientPtr /* pClient */ ,
+                                     int /* size */ ,
+                                     xGetModifierMappingReply *
+                                     /* pRep */ );
 
-extern _X_EXPORT void SQColorsExtend(ClientPtr /* pClient */ ,
+extern void SGetKeyboardControlReply(ClientPtr /* pClient */ ,
                                      int /* size */ ,
-                                     xrgb * /* prgb */ );
-
-extern _X_EXPORT void SQueryColorsReply(ClientPtr /* pClient */ ,
-                                        int /* size */ ,
-                                        xQueryColorsReply * /* pRep */ );
-
-extern _X_EXPORT void SLookupColorReply(ClientPtr /* pClient */ ,
-                                        int /* size */ ,
-                                        xLookupColorReply * /* pRep */ );
-
-extern _X_EXPORT void SQueryBestSizeReply(ClientPtr /* pClient */ ,
-                                          int /* size */ ,
-                                          xQueryBestSizeReply * /* pRep */ );
-
-extern _X_EXPORT void SListExtensionsReply(ClientPtr /* pClient */ ,
-                                           int /* size */ ,
-                                           xListExtensionsReply * /* pRep */ );
-
-extern _X_EXPORT void SGetKeyboardMappingReply(ClientPtr /* pClient */ ,
-                                               int /* size */ ,
-                                               xGetKeyboardMappingReply *
-                                               /* pRep */ );
-
-extern _X_EXPORT void SGetPointerMappingReply(ClientPtr /* pClient */ ,
-                                              int /* size */ ,
-                                              xGetPointerMappingReply *
-                                              /* pRep */ );
-
-extern _X_EXPORT void SGetModifierMappingReply(ClientPtr /* pClient */ ,
-                                               int /* size */ ,
-                                               xGetModifierMappingReply *
-                                               /* pRep */ );
-
-extern _X_EXPORT void SGetKeyboardControlReply(ClientPtr /* pClient */ ,
-                                               int /* size */ ,
-                                               xGetKeyboardControlReply *
-                                               /* pRep */ );
-
-extern _X_EXPORT void SGetPointerControlReply(ClientPtr /* pClient */ ,
-                                              int /* size */ ,
-                                              xGetPointerControlReply *
-                                              /* pRep */ );
-
-extern _X_EXPORT void SGetScreenSaverReply(ClientPtr /* pClient */ ,
-                                           int /* size */ ,
-                                           xGetScreenSaverReply * /* pRep */ );
-
-extern _X_EXPORT void SLHostsExtend(ClientPtr /* pClient */ ,
+                                     xGetKeyboardControlReply *
+                                     /* pRep */ );
+
+extern void SGetPointerControlReply(ClientPtr /* pClient */ ,
                                     int /* size */ ,
-                                    char * /* buf */ );
+                                    xGetPointerControlReply *
+                                    /* pRep */ );
 
-extern _X_EXPORT void SListHostsReply(ClientPtr /* pClient */ ,
-                                      int /* size */ ,
-                                      xListHostsReply * /* pRep */ );
+extern void SGetScreenSaverReply(ClientPtr /* pClient */ ,
+                                 int /* size */ ,
+                                 xGetScreenSaverReply * /* pRep */ );
+
+extern void SLHostsExtend(ClientPtr /* pClient */ ,
+                          int /* size */ ,
+                          char * /* buf */ );
+
+extern void SListHostsReply(ClientPtr /* pClient */ ,
+                            int /* size */ ,
+                            xListHostsReply * /* pRep */ );
 
-extern _X_EXPORT void SErrorEvent(xError * /* from */ ,
-                                  xError * /* to */ );
+extern void SErrorEvent(xError * /* from */ ,
+                        xError * /* to */ );
 
-extern _X_EXPORT void SwapConnSetupInfo(char * /* pInfo */ ,
-                                        char * /* pInfoTBase */ );
+extern void SwapConnSetupInfo(char * /* pInfo */ ,
+                              char * /* pInfoTBase */ );
 
-extern _X_EXPORT void WriteSConnectionInfo(ClientPtr /* pClient */ ,
-                                           unsigned long /* size */ ,
-                                           char * /* pInfo */ );
+extern void WriteSConnectionInfo(ClientPtr /* pClient */ ,
+                                 unsigned long /* size */ ,
+                                 char * /* pInfo */ );
 
-extern _X_EXPORT void SwapConnSetupPrefix(xConnSetupPrefix * /* pcspFrom */ ,
-                                          xConnSetupPrefix * /* pcspTo */ );
+extern void SwapConnSetupPrefix(xConnSetupPrefix * /* pcspFrom */ ,
+                                xConnSetupPrefix * /* pcspTo */ );
 
-extern _X_EXPORT void WriteSConnSetupPrefix(ClientPtr /* pClient */ ,
-                                            xConnSetupPrefix * /* pcsp */ );
+extern void WriteSConnSetupPrefix(ClientPtr /* pClient */ ,
+                                  xConnSetupPrefix * /* pcsp */ );
 
 #undef SWAPREP_PROC
-#define SWAPREP_PROC(func) extern _X_EXPORT void func(xEvent * /* from */, xEvent * /* to */)
+#define SWAPREP_PROC(func) extern void func(xEvent * /* from */, xEvent * /* to */)
 
 SWAPREP_PROC(SCirculateEvent);
 SWAPREP_PROC(SClientMessageEvent);
diff --git a/include/swapreq.h b/include/swapreq.h
index 07eff807f..d696aa05e 100644
--- a/include/swapreq.h
+++ b/include/swapreq.h
@@ -26,13 +26,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef SWAPREQ_H
 #define SWAPREQ_H 1
 
-extern _X_EXPORT void SwapColorItem(xColorItem * /* pItem */ );
+extern void SwapColorItem(xColorItem * /* pItem */ );
 
-extern _X_EXPORT void SwapConnClientPrefix(xConnClientPrefix * /* pCCP */ );
+extern void SwapConnClientPrefix(xConnClientPrefix * /* pCCP */ );
 
 #undef SWAPREQ_PROC
 
-#define SWAPREQ_PROC(func) extern _X_EXPORT int func(ClientPtr /* client */)
+#define SWAPREQ_PROC(func) extern int func(ClientPtr /* client */)
 
 SWAPREQ_PROC(SProcAllocColor);
 SWAPREQ_PROC(SProcAllocColorCells);