summaryrefslogtreecommitdiff
path: root/dix/swapreq.c
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
commit49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch)
treeeebaec908150abfc0159d9ee941404918f553113 /dix/swapreq.c
parent0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (diff)
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source files. Instead, it should be used in headers, and the proper C source include that header. Some special cases are symbols that need to be shared between modules, but not expected to be used by external drivers, and symbols that are accessible via LoaderSymbol/dlopen. This patch also adds conditionally some new sdk header files, depending on extensions enabled. These files were added to match pattern for other extensions/modules, that is, have the headers "deciding" symbol visibility in the sdk. These headers are: o Xext/panoramiXsrv.h, Xext/panoramiX.h o fbpict.h (unconditionally) o vidmodeproc.h o mioverlay.h (unconditionally, used only by xaa) o xfixes.h (unconditionally, symbols required by dri2) LoaderSymbol and similar functions now don't have different prototypes, in loaderProcs.h and xf86Module.h, so that both headers can be included, without the need of defining IN_LOADER. xf86NewInputDevice() device prototype readded to xf86Xinput.h, but not exported (and with a comment about it).
Diffstat (limited to 'dix/swapreq.c')
-rw-r--r--dix/swapreq.c140
1 files changed, 70 insertions, 70 deletions
diff --git a/dix/swapreq.c b/dix/swapreq.c
index 1b90351b0..1b8f352f5 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -62,7 +62,7 @@ SOFTWARE.
/* Thanks to Jack Palevich for testing and subsequently rewriting all this */
/* Byte swap a list of longs */
-_X_EXPORT void
+void
SwapLongs (CARD32 *list, unsigned long count)
{
char n;
@@ -88,7 +88,7 @@ SwapLongs (CARD32 *list, unsigned long count)
}
/* Byte swap a list of shorts */
-_X_EXPORT void
+void
SwapShorts (short *list, unsigned long count)
{
char n;
@@ -123,7 +123,7 @@ SwapShorts (short *list, unsigned long count)
/* The following is used for all requests that have
no fields to be swapped (except "length") */
-_X_EXPORT int
+int
SProcSimpleReq(ClientPtr client)
{
char n;
@@ -136,7 +136,7 @@ SProcSimpleReq(ClientPtr client)
/* The following is used for all requests that have
only a single 32-bit field to be swapped, coming
right after the "length" field */
-_X_EXPORT int
+int
SProcResourceReq(ClientPtr client)
{
char n;
@@ -148,7 +148,7 @@ SProcResourceReq(ClientPtr client)
return(*ProcVector[stuff->reqType])(client);
}
-_X_EXPORT int
+int
SProcCreateWindow(ClientPtr client)
{
char n;
@@ -170,7 +170,7 @@ SProcCreateWindow(ClientPtr client)
return((* ProcVector[X_CreateWindow])(client));
}
-_X_EXPORT int
+int
SProcChangeWindowAttributes(ClientPtr client)
{
char n;
@@ -184,7 +184,7 @@ SProcChangeWindowAttributes(ClientPtr client)
return((* ProcVector[X_ChangeWindowAttributes])(client));
}
-_X_EXPORT int
+int
SProcReparentWindow(ClientPtr client)
{
char n;
@@ -198,7 +198,7 @@ SProcReparentWindow(ClientPtr client)
return((* ProcVector[X_ReparentWindow])(client));
}
-_X_EXPORT int
+int
SProcConfigureWindow(ClientPtr client)
{
char n;
@@ -213,7 +213,7 @@ SProcConfigureWindow(ClientPtr client)
}
-_X_EXPORT int
+int
SProcInternAtom(ClientPtr client)
{
char n;
@@ -224,7 +224,7 @@ SProcInternAtom(ClientPtr client)
return((* ProcVector[X_InternAtom])(client));
}
-_X_EXPORT int
+int
SProcChangeProperty(ClientPtr client)
{
char n;
@@ -248,7 +248,7 @@ SProcChangeProperty(ClientPtr client)
return((* ProcVector[X_ChangeProperty])(client));
}
-_X_EXPORT int
+int
SProcDeleteProperty(ClientPtr client)
{
char n;
@@ -261,7 +261,7 @@ SProcDeleteProperty(ClientPtr client)
}
-_X_EXPORT int
+int
SProcGetProperty(ClientPtr client)
{
char n;
@@ -276,7 +276,7 @@ SProcGetProperty(ClientPtr client)
return((* ProcVector[X_GetProperty])(client));
}
-_X_EXPORT int
+int
SProcSetSelectionOwner(ClientPtr client)
{
char n;
@@ -289,7 +289,7 @@ SProcSetSelectionOwner(ClientPtr client)
return((* ProcVector[X_SetSelectionOwner])(client));
}
-_X_EXPORT int
+int
SProcConvertSelection(ClientPtr client)
{
char n;
@@ -304,7 +304,7 @@ SProcConvertSelection(ClientPtr client)
return((* ProcVector[X_ConvertSelection])(client));
}
-_X_EXPORT int
+int
SProcSendEvent(ClientPtr client)
{
char n;
@@ -326,7 +326,7 @@ SProcSendEvent(ClientPtr client)
return((* ProcVector[X_SendEvent])(client));
}
-_X_EXPORT int
+int
SProcGrabPointer(ClientPtr client)
{
char n;
@@ -341,7 +341,7 @@ SProcGrabPointer(ClientPtr client)
return((* ProcVector[X_GrabPointer])(client));
}
-_X_EXPORT int
+int
SProcGrabButton(ClientPtr client)
{
char n;
@@ -356,7 +356,7 @@ SProcGrabButton(ClientPtr client)
return((* ProcVector[X_GrabButton])(client));
}
-_X_EXPORT int
+int
SProcUngrabButton(ClientPtr client)
{
char n;
@@ -368,7 +368,7 @@ SProcUngrabButton(ClientPtr client)
return((* ProcVector[X_UngrabButton])(client));
}
-_X_EXPORT int
+int
SProcChangeActivePointerGrab(ClientPtr client)
{
char n;
@@ -381,7 +381,7 @@ SProcChangeActivePointerGrab(ClientPtr client)
return((* ProcVector[X_ChangeActivePointerGrab])(client));
}
-_X_EXPORT int
+int
SProcGrabKeyboard(ClientPtr client)
{
char n;
@@ -393,7 +393,7 @@ SProcGrabKeyboard(ClientPtr client)
return((* ProcVector[X_GrabKeyboard])(client));
}
-_X_EXPORT int
+int
SProcGrabKey(ClientPtr client)
{
char n;
@@ -405,7 +405,7 @@ SProcGrabKey(ClientPtr client)
return((* ProcVector[X_GrabKey])(client));
}
-_X_EXPORT int
+int
SProcUngrabKey(ClientPtr client)
{
char n;
@@ -417,7 +417,7 @@ SProcUngrabKey(ClientPtr client)
return((* ProcVector[X_UngrabKey])(client));
}
-_X_EXPORT int
+int
SProcGetMotionEvents(ClientPtr client)
{
char n;
@@ -430,7 +430,7 @@ SProcGetMotionEvents(ClientPtr client)
return((* ProcVector[X_GetMotionEvents])(client));
}
-_X_EXPORT int
+int
SProcTranslateCoords(ClientPtr client)
{
char n;
@@ -444,7 +444,7 @@ SProcTranslateCoords(ClientPtr client)
return((* ProcVector[X_TranslateCoords])(client));
}
-_X_EXPORT int
+int
SProcWarpPointer(ClientPtr client)
{
char n;
@@ -462,7 +462,7 @@ SProcWarpPointer(ClientPtr client)
return((* ProcVector[X_WarpPointer])(client));
}
-_X_EXPORT int
+int
SProcSetInputFocus(ClientPtr client)
{
char n;
@@ -474,7 +474,7 @@ SProcSetInputFocus(ClientPtr client)
return((* ProcVector[X_SetInputFocus])(client));
}
-_X_EXPORT int
+int
SProcOpenFont(ClientPtr client)
{
char n;
@@ -486,7 +486,7 @@ SProcOpenFont(ClientPtr client)
return((* ProcVector[X_OpenFont])(client));
}
-_X_EXPORT int
+int
SProcListFonts(ClientPtr client)
{
char n;
@@ -498,7 +498,7 @@ SProcListFonts(ClientPtr client)
return((* ProcVector[X_ListFonts])(client));
}
-_X_EXPORT int
+int
SProcListFontsWithInfo(ClientPtr client)
{
char n;
@@ -510,7 +510,7 @@ SProcListFontsWithInfo(ClientPtr client)
return((* ProcVector[X_ListFontsWithInfo])(client));
}
-_X_EXPORT int
+int
SProcSetFontPath(ClientPtr client)
{
char n;
@@ -521,7 +521,7 @@ SProcSetFontPath(ClientPtr client)
return((* ProcVector[X_SetFontPath])(client));
}
-_X_EXPORT int
+int
SProcCreatePixmap(ClientPtr client)
{
char n;
@@ -536,7 +536,7 @@ SProcCreatePixmap(ClientPtr client)
return((* ProcVector[X_CreatePixmap])(client));
}
-_X_EXPORT int
+int
SProcCreateGC(ClientPtr client)
{
char n;
@@ -550,7 +550,7 @@ SProcCreateGC(ClientPtr client)
return((* ProcVector[X_CreateGC])(client));
}
-_X_EXPORT int
+int
SProcChangeGC(ClientPtr client)
{
char n;
@@ -563,7 +563,7 @@ SProcChangeGC(ClientPtr client)
return((* ProcVector[X_ChangeGC])(client));
}
-_X_EXPORT int
+int
SProcCopyGC(ClientPtr client)
{
char n;
@@ -576,7 +576,7 @@ SProcCopyGC(ClientPtr client)
return((* ProcVector[X_CopyGC])(client));
}
-_X_EXPORT int
+int
SProcSetDashes(ClientPtr client)
{
char n;
@@ -590,7 +590,7 @@ SProcSetDashes(ClientPtr client)
}
-_X_EXPORT int
+int
SProcSetClipRectangles(ClientPtr client)
{
char n;
@@ -604,7 +604,7 @@ SProcSetClipRectangles(ClientPtr client)
return((* ProcVector[X_SetClipRectangles])(client));
}
-_X_EXPORT int
+int
SProcClearToBackground(ClientPtr client)
{
char n;
@@ -619,7 +619,7 @@ SProcClearToBackground(ClientPtr client)
return((* ProcVector[X_ClearArea])(client));
}
-_X_EXPORT int
+int
SProcCopyArea(ClientPtr client)
{
char n;
@@ -638,7 +638,7 @@ SProcCopyArea(ClientPtr client)
return((* ProcVector[X_CopyArea])(client));
}
-_X_EXPORT int
+int
SProcCopyPlane(ClientPtr client)
{
char n;
@@ -660,7 +660,7 @@ SProcCopyPlane(ClientPtr client)
/* The following routine is used for all Poly drawing requests
(except FillPoly, which uses a different request format) */
-_X_EXPORT int
+int
SProcPoly(ClientPtr client)
{
char n;
@@ -677,7 +677,7 @@ SProcPoly(ClientPtr client)
/* cannot use SProcPoly for this one, because xFillPolyReq
is longer than xPolyPointReq, and we don't want to swap
the difference as shorts! */
-_X_EXPORT int
+int
SProcFillPoly(ClientPtr client)
{
char n;
@@ -691,7 +691,7 @@ SProcFillPoly(ClientPtr client)
return((* ProcVector[X_FillPoly])(client));
}
-_X_EXPORT int
+int
SProcPutImage(ClientPtr client)
{
char n;
@@ -709,7 +709,7 @@ SProcPutImage(ClientPtr client)
}
-_X_EXPORT int
+int
SProcGetImage(ClientPtr client)
{
char n;
@@ -727,7 +727,7 @@ SProcGetImage(ClientPtr client)
/* ProcPolyText used for both PolyText8 and PolyText16 */
-_X_EXPORT int
+int
SProcPolyText(ClientPtr client)
{
char n;
@@ -743,7 +743,7 @@ SProcPolyText(ClientPtr client)
/* ProcImageText used for both ImageText8 and ImageText16 */
-_X_EXPORT int
+int
SProcImageText(ClientPtr client)
{
char n;
@@ -757,7 +757,7 @@ SProcImageText(ClientPtr client)
return((* ProcVector[stuff->reqType])(client));
}
-_X_EXPORT int
+int
SProcCreateColormap(ClientPtr client)
{
char n;
@@ -771,7 +771,7 @@ SProcCreateColormap(ClientPtr client)
}
-_X_EXPORT int
+int
SProcCopyColormapAndFree(ClientPtr client)
{
char n;
@@ -784,7 +784,7 @@ SProcCopyColormapAndFree(ClientPtr client)
}
-_X_EXPORT int
+int
SProcAllocColor(ClientPtr client)
{
char n;
@@ -798,7 +798,7 @@ SProcAllocColor(ClientPtr client)
return((* ProcVector[X_AllocColor])(client));
}
-_X_EXPORT int
+int
SProcAllocNamedColor(ClientPtr client)
{
char n;
@@ -811,7 +811,7 @@ SProcAllocNamedColor(ClientPtr client)
return((* ProcVector[X_AllocNamedColor])(client));
}
-_X_EXPORT int
+int
SProcAllocColorCells(ClientPtr client)
{
char n;
@@ -824,7 +824,7 @@ SProcAllocColorCells(ClientPtr client)
return((* ProcVector[X_AllocColorCells])(client));
}
-_X_EXPORT int
+int
SProcAllocColorPlanes(ClientPtr client)
{
char n;
@@ -839,7 +839,7 @@ SProcAllocColorPlanes(ClientPtr client)
return((* ProcVector[X_AllocColorPlanes])(client));
}
-_X_EXPORT int
+int
SProcFreeColors(ClientPtr client)
{
char n;
@@ -853,7 +853,7 @@ SProcFreeColors(ClientPtr client)
}
-_X_EXPORT void
+void
SwapColorItem(xColorItem *pItem)
{
char n;
@@ -864,7 +864,7 @@ SwapColorItem(xColorItem *pItem)
swaps(&pItem->blue, n);
}
-_X_EXPORT int
+int
SProcStoreColors(ClientPtr client)
{
char n;
@@ -881,7 +881,7 @@ SProcStoreColors(ClientPtr client)
return((* ProcVector[X_StoreColors])(client));
}
-_X_EXPORT int
+int
SProcStoreNamedColor (ClientPtr client)
{
char n;
@@ -894,7 +894,7 @@ SProcStoreNamedColor (ClientPtr client)
return((* ProcVector[X_StoreNamedColor])(client));
}
-_X_EXPORT int
+int
SProcQueryColors (ClientPtr client)
{
char n;
@@ -906,7 +906,7 @@ SProcQueryColors (ClientPtr client)
return((* ProcVector[X_QueryColors])(client));
}
-_X_EXPORT int
+int
SProcLookupColor (ClientPtr client)
{
char n;
@@ -918,7 +918,7 @@ SProcLookupColor (ClientPtr client)
return((* ProcVector[X_LookupColor])(client));
}
-_X_EXPORT int
+int
SProcCreateCursor (ClientPtr client)
{
char n;
@@ -939,7 +939,7 @@ SProcCreateCursor (ClientPtr client)
return((* ProcVector[X_CreateCursor])(client));
}
-_X_EXPORT int
+int
SProcCreateGlyphCursor (ClientPtr client)
{
char n;
@@ -961,7 +961,7 @@ SProcCreateGlyphCursor (ClientPtr client)
}
-_X_EXPORT int
+int
SProcRecolorCursor (ClientPtr client)
{
char n;
@@ -978,7 +978,7 @@ SProcRecolorCursor (ClientPtr client)
return((* ProcVector[X_RecolorCursor])(client));
}
-_X_EXPORT int
+int
SProcQueryBestSize (ClientPtr client)
{
char n;
@@ -992,7 +992,7 @@ SProcQueryBestSize (ClientPtr client)
}
-_X_EXPORT int
+int
SProcQueryExtension (ClientPtr client)
{
char n;
@@ -1003,7 +1003,7 @@ SProcQueryExtension (ClientPtr client)
return((* ProcVector[X_QueryExtension])(client));
}
-_X_EXPORT int
+int
SProcChangeKeyboardMapping (ClientPtr client)
{
char n;
@@ -1015,7 +1015,7 @@ SProcChangeKeyboardMapping (ClientPtr client)
}
-_X_EXPORT int
+int
SProcChangeKeyboardControl (ClientPtr client)
{
char n;
@@ -1027,7 +1027,7 @@ SProcChangeKeyboardControl (ClientPtr client)
return((* ProcVector[X_ChangeKeyboardControl])(client));
}
-_X_EXPORT int
+int
SProcChangePointerControl (ClientPtr client)
{
char n;
@@ -1041,7 +1041,7 @@ SProcChangePointerControl (ClientPtr client)
}
-_X_EXPORT int
+int
SProcSetScreenSaver (ClientPtr client)
{
char n;
@@ -1053,7 +1053,7 @@ SProcSetScreenSaver (ClientPtr client)
return((* ProcVector[X_SetScreenSaver])(client));
}
-_X_EXPORT int
+int
SProcChangeHosts (ClientPtr client)
{
char n;
@@ -1066,7 +1066,7 @@ SProcChangeHosts (ClientPtr client)
}
-_X_EXPORT int SProcRotateProperties (ClientPtr client)
+int SProcRotateProperties (ClientPtr client)
{
char n;
REQUEST(xRotatePropertiesReq);
@@ -1079,7 +1079,7 @@ _X_EXPORT int SProcRotateProperties (ClientPtr client)
return ((* ProcVector[X_RotateProperties])(client));
}
-_X_EXPORT int
+int
SProcNoOperation(ClientPtr client)
{
char n;
@@ -1088,7 +1088,7 @@ SProcNoOperation(ClientPtr client)
return ((* ProcVector[X_NoOperation])(client));
}
-_X_EXPORT void
+void
SwapConnClientPrefix(xConnClientPrefix *pCCP)
{
char n;