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 /hw/xfree86/common/xf86Init.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 'hw/xfree86/common/xf86Init.c')
-rw-r--r-- | hw/xfree86/common/xf86Init.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index e8095e5d5..eacf34449 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -613,7 +613,7 @@ check_for_matching_devices(DriverPtr drvp) * If a device can be successfully probed by the driver, \c TRUE is * returned. Otherwise, \c FALSE is returned. */ -_X_EXPORT Bool +Bool xf86CallDriverProbe( DriverPtr drv, Bool detect_only ) { Bool foundScreen = FALSE; @@ -719,7 +719,7 @@ DoProbe(void) * That includes vt-manager setup, querying all possible devices and * collecting the pixmap formats. */ -_X_EXPORT void +void InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) { int i, j, k, scr_index; @@ -1305,7 +1305,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) * Initialize all supported input devices. */ -_X_EXPORT void +void InitInput(argc, argv) int argc; char **argv; @@ -1336,7 +1336,7 @@ InitInput(argc, argv) * is called by dix before establishing the well known sockets. */ -_X_EXPORT void +void OsVendorInit() { static Bool beenHere = FALSE; @@ -1381,7 +1381,7 @@ OsVendorInit() * checking here, since there should be restored as much as possible. */ -_X_EXPORT void +void ddxGiveUp() { int i; @@ -1426,7 +1426,7 @@ ddxGiveUp() * are closed. */ -_X_EXPORT void +void AbortDDX() { int i; @@ -1462,7 +1462,7 @@ AbortDDX() ddxGiveUp(); } -_X_EXPORT void +void OsVendorFatalError() { #ifdef VENDORSUPPORT @@ -1478,7 +1478,7 @@ OsVendorFatalError() ErrorF("\n"); } -_X_EXPORT int +int xf86SetVerbosity(int verb) { int save = xf86Verbose; @@ -1488,7 +1488,7 @@ xf86SetVerbosity(int verb) return save; } -_X_EXPORT int +int xf86SetLogVerbosity(int verb) { int save = xf86LogVerbose; @@ -1519,7 +1519,7 @@ xf86PrintDefaultLibraryPath(void) */ /* ARGSUSED */ -_X_EXPORT int +int ddxProcessArgument(int argc, char **argv, int i) { /* @@ -1854,7 +1854,7 @@ ddxProcessArgument(int argc, char **argv, int i) * Maybe the user now knows what really to do ... */ -_X_EXPORT void +void ddxUseMsg() { ErrorF("\n"); @@ -1908,7 +1908,7 @@ ddxUseMsg() /* * xf86LoadModules iterates over a list that is being passed in. */ -_X_EXPORT Bool +Bool xf86LoadModules(char **list, pointer *optlist) { int errmaj, errmin; @@ -1950,7 +1950,7 @@ xf86LoadModules(char **list, pointer *optlist) /* Pixmap format stuff */ -_X_EXPORT PixmapFormatPtr +PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth) { int i; @@ -1995,7 +1995,7 @@ xf86GetPixFormat(ScrnInfoPtr pScrn, int depth) return NULL; } -_X_EXPORT int +int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth) { PixmapFormatPtr format; |