diff options
author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
---|---|---|
committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
commit | 49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch) | |
tree | eebaec908150abfc0159d9ee941404918f553113 /dix/main.c | |
parent | 0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (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/main.c')
-rw-r--r-- | dix/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dix/main.c b/dix/main.c index 1b7a9914d..354599157 100644 --- a/dix/main.c +++ b/dix/main.c @@ -130,11 +130,11 @@ static #endif Bool CreateConnectionBlock(void); -_X_EXPORT PaddingInfo PixmapWidthPaddingInfo[33]; +PaddingInfo PixmapWidthPaddingInfo[33]; int connBlockScreenStart; -_X_EXPORT void +void NotImplemented(xEvent *from, xEvent *to) { FatalError("Not implemented"); @@ -144,7 +144,7 @@ NotImplemented(xEvent *from, xEvent *to) * Dummy entry for ReplySwapVector[] */ -_X_EXPORT void +void ReplyNotSwappd( ClientPtr pClient , int size , @@ -446,13 +446,13 @@ int main(int argc, char *argv[], char *envp[]) static int VendorRelease = VENDOR_RELEASE; static char *VendorString = VENDOR_NAME; -_X_EXPORT void +void SetVendorRelease(int release) { VendorRelease = release; } -_X_EXPORT void +void SetVendorString(char *string) { VendorString = string; @@ -609,7 +609,7 @@ with its screen number, a pointer to its ScreenRec, argc, and argv. */ -_X_EXPORT int +int AddScreen( Bool (* pfnInit)( int /*index*/, |