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/ddc/xf86DDC.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/ddc/xf86DDC.c')
| -rw-r--r-- | hw/xfree86/ddc/xf86DDC.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index c5b070dc7..c989cd232 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.26 2003/08/22 17:56:24 dawes Exp $ */ - /* xf86DDC.c * * Copyright 1998,1999 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> @@ -15,9 +13,7 @@ #include "ddcPriv.h" #include <string.h> -#ifdef XFree86LOADER static const OptionInfoRec *DDCAvailableOptions(void *unused); -#endif const char *i2cSymbols[] = { "xf86CreateI2CDevRec", @@ -28,8 +24,6 @@ const char *i2cSymbols[] = { NULL }; -#ifdef XFree86LOADER - static MODULESETUPPROTO(ddcSetup); static XF86ModuleVersionInfo ddcVersRec = @@ -46,7 +40,7 @@ static XF86ModuleVersionInfo ddcVersRec = {0,0,0,0} }; -XF86ModuleData ddcModuleData = { &ddcVersRec, ddcSetup, NULL }; +_X_EXPORT XF86ModuleData ddcModuleData = { &ddcVersRec, ddcSetup, NULL }; ModuleInfoRec DDC = { 1, @@ -63,9 +57,6 @@ ddcSetup(pointer module, pointer opts, int *errmaj, int *errmin) if (!setupDone) { setupDone = TRUE; -#ifndef REMOVE_LOADER_CHECK_MODULE_INFO - if (xf86LoaderCheckSymbol("xf86AddModuleInfo")) -#endif xf86AddModuleInfo(&DDC, module); /* * Tell the loader about symbols from other modules that this module @@ -81,8 +72,6 @@ ddcSetup(pointer module, pointer opts, int *errmaj, int *errmin) return (pointer)1; } -#endif - #define RETRIES 4 static unsigned char *EDIDRead_DDC1( |