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/dixmods/xf86XTrapModule.c | |
| 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/dixmods/xf86XTrapModule.c')
| -rw-r--r-- | hw/xfree86/dixmods/xf86XTrapModule.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/hw/xfree86/dixmods/xf86XTrapModule.c b/hw/xfree86/dixmods/xf86XTrapModule.c index 1783d577a..e89d7751d 100644 --- a/hw/xfree86/dixmods/xf86XTrapModule.c +++ b/hw/xfree86/dixmods/xf86XTrapModule.c @@ -1,6 +1,4 @@ -/* $XFree86$ */ -/* This is the xf86 module code for the DEC_XTRAP extension. - */ +/* This is the xf86 module code for the DEC_XTRAP extension. */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> @@ -12,11 +10,9 @@ extern void DEC_XTRAPInit(INITARGS); -#ifdef XFree86LOADER - static MODULESETUPPROTO(xtrapSetup); -ExtensionModule xtrapExt = +static ExtensionModule xtrapExt = { DEC_XTRAPInit, XTrapExtName, @@ -39,7 +35,7 @@ static XF86ModuleVersionInfo xtrapVersRec = {0,0,0,0} }; -XF86ModuleData xtrapModuleData = { &xtrapVersRec, xtrapSetup, NULL }; +_X_EXPORT XF86ModuleData xtrapModuleData = { &xtrapVersRec, xtrapSetup, NULL }; static pointer xtrapSetup(pointer module, pointer opts, int *errmaj, int *errmin) { @@ -47,5 +43,3 @@ xtrapSetup(pointer module, pointer opts, int *errmaj, int *errmin) { /* Need a non-NULL return value to indicate success */ return (pointer)1; } - -#endif /* XFree86LOADER */ |