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/scanpci | |
| 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/scanpci')
| -rw-r--r-- | hw/xfree86/scanpci/xf86ScanPci.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c index 8c897bd20..2343f001b 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.c +++ b/hw/xfree86/scanpci/xf86ScanPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.13 2003/08/24 17:37:10 dawes Exp $ */ /* * Display the Subsystem Vendor Id and Subsystem Id in order to identify * the cards installed in this computer @@ -75,8 +74,6 @@ #include "xf86PciIds.h" #include "xf86ScanPci.h" -#ifdef XFree86LOADER - #include "xf86Module.h" #ifdef PCIDATA @@ -94,7 +91,7 @@ static XF86ModuleVersionInfo pciDataVersRec = { {0, 0, 0, 0} }; -XF86ModuleData pcidataModuleData = { &pciDataVersRec, NULL, NULL }; +_X_EXPORT XF86ModuleData pcidataModuleData = { &pciDataVersRec, NULL, NULL }; #else @@ -111,12 +108,10 @@ static XF86ModuleVersionInfo scanPciVersRec = { {0, 0, 0, 0} }; -XF86ModuleData scanpciModuleData = { &scanPciVersRec, NULL, NULL }; +_X_EXPORT XF86ModuleData scanpciModuleData = { &scanPciVersRec, NULL, NULL }; #endif /* PCIDATA */ -#endif /* XFree86LOADER */ - /* Initialisation/Close hooks, in case they're ever needed. */ Bool ScanPciSetupPciIds(void) |