diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-06-25 21:17:00 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-06-25 21:17:00 +0000 |
| commit | 38dac1c4fcacf74b20eccb84b932f229fdd8e915 (patch) | |
| tree | 6f28e8cdcdc487e453ad8e37c5459cc86a66da6e | |
| parent | 358885f2fec6365f8e061fd5b547e95229bc45f5 (diff) | |
Bug #3626: _X_EXPORT tags for video and input drivers.XORG-6_8_99_14XORG-6_8_99_13
| -rw-r--r-- | src/generic.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/generic.c b/src/generic.c index ae7920f..628e718 100644 --- a/src/generic.c +++ b/src/generic.c @@ -87,10 +87,10 @@ static int VGAFindIsaDevice(GDevPtr dev); static Bool GenericMapMem(ScrnInfoPtr scrp); #endif -static int GenericValidMode(int, DisplayModePtr, Bool, int); +static ModeStatus GenericValidMode(int, DisplayModePtr, Bool, int); /* The root of all evil... */ -DriverRec VGA = +_X_EXPORT DriverRec VGA = { VGA_VERSION_CURRENT, VGA_DRIVER_NAME, @@ -178,7 +178,7 @@ static XF86ModuleVersionInfo GenericVersionRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, VGA_VERSION_MAJOR, VGA_VERSION_MINOR, VGA_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, @@ -190,7 +190,11 @@ static XF86ModuleVersionInfo GenericVersionRec = * This data is accessed by the loader. The name must be the module name * followed by "ModuleData". */ -XF86ModuleData vgaModuleData = { &GenericVersionRec, GenericSetup, NULL }; +_X_EXPORT XF86ModuleData vgaModuleData = { + &GenericVersionRec, + GenericSetup, + NULL +}; static pointer GenericSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) @@ -1564,7 +1568,7 @@ GenericFreeScreen(int scrnIndex, int flags) } -static int +static ModeStatus GenericValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags) { if (pMode->Flags & V_INTERLACE) |