diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-06-05 03:00:24 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-06-05 03:00:24 +0000 |
| commit | 52fc7c8dc70226cc7f03454e9be86a627672295f (patch) | |
| tree | ecba684625dd0a7c561a261c6fe0fd36515b7af7 /hw/xfree86/xaa | |
| parent | d22582dc5a070f72d4653e24d1e4ebe4a112276e (diff) | |
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
XFree86LOADER ifdefs, non-loadable hasn't been supported for a while
now. Remove completely gratuitious REMOVE_LOADER_CHECK_MODULE_INFO
ifdefs surrounding a call to a function added in XFree86 4.1 (!).
Miscellaneous static markings.
Diffstat (limited to 'hw/xfree86/xaa')
| -rw-r--r-- | hw/xfree86/xaa/xaaInitAccel.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index 861410b6d..fe0b70a14 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.35tsi Exp $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif @@ -18,9 +16,7 @@ #include "xf86fbman.h" #include "servermd.h" -#ifdef XFree86LOADER static const OptionInfoRec *XAAAvailableOptions(void *unused); -#endif /* * XAA Config options @@ -97,7 +93,6 @@ static const OptionInfoRec XAAOptions[] = { OPTV_NONE, {0}, FALSE } }; -#ifdef XFree86LOADER static MODULESETUPPROTO(xaaSetup); static XF86ModuleVersionInfo xaaVersRec = @@ -114,7 +109,7 @@ static XF86ModuleVersionInfo xaaVersRec = {0,0,0,0} }; -XF86ModuleData xaaModuleData = { &xaaVersRec, xaaSetup, NULL }; +_X_EXPORT XF86ModuleData xaaModuleData = { &xaaVersRec, xaaSetup, NULL }; ModuleInfoRec XAA = { 1, @@ -132,9 +127,6 @@ xaaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) if (!Initialised) { Initialised = TRUE; -#ifndef REMOVE_LOADER_CHECK_MODULE_INFO - if (xf86LoaderCheckSymbol("xf86AddModuleInfo")) -#endif xf86AddModuleInfo(&XAA, Module); } @@ -147,7 +139,6 @@ XAAAvailableOptions(void *unused) { return (XAAOptions); } -#endif Bool XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec) |