frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Adam Jackson 2006-06-05 03:00:24 +00:00
parent d22582dc5a
commit 52fc7c8dc7
40 changed files with 106 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ChangeLog
View File

@ -3,6 +3,51 @@
* hw/xfree86/loader/dixsym.c: * hw/xfree86/loader/dixsym.c:
Remove a stray LBX reference. Remove a stray LBX reference.
* hw/xfree86/ddc/xf86DDC.c:
* hw/xfree86/dixmods/GLcoremodule.c:
* hw/xfree86/dixmods/afbmodule.c:
* hw/xfree86/dixmods/cfb32module.c:
* hw/xfree86/dixmods/cfbmodule.c:
* hw/xfree86/dixmods/dbemodule.c:
* hw/xfree86/dixmods/fbmodule.c:
* hw/xfree86/dixmods/ftmodule.c:
* hw/xfree86/dixmods/glxmodule.c:
* hw/xfree86/dixmods/mfbmodule.c:
* hw/xfree86/dixmods/recordmod.c:
* hw/xfree86/dixmods/shmodule.c:
* hw/xfree86/dixmods/type1mod.c:
* hw/xfree86/dixmods/xf86XTrapModule.c:
* hw/xfree86/dixmods/extmod/modinit.c:
* hw/xfree86/dri/drimodule.c:
* hw/xfree86/exa/examodule.c:
* hw/xfree86/fbdevhw/fbdevhw.c:
* hw/xfree86/i2c/bt829_module.c:
* hw/xfree86/i2c/fi1236_module.c:
* hw/xfree86/i2c/msp3430_module.c:
* hw/xfree86/i2c/tda8425_module.c:
* hw/xfree86/i2c/tda9850_module.c:
* hw/xfree86/i2c/tda9885_module.c:
* hw/xfree86/i2c/uda1380_module.c:
* hw/xfree86/i2c/xf86i2cmodule.c:
* hw/xfree86/int10/xf86int10module.c:
* hw/xfree86/os-support/drm/drmmodule.c:
* hw/xfree86/rac/xf86RACmodule.c:
* hw/xfree86/ramdac/xf86RamDacMod.c:
* hw/xfree86/scanpci/xf86ScanPci.c:
* hw/xfree86/shadowfb/sfbmodule.c:
* hw/xfree86/vbe/vbe_module.c:
* hw/xfree86/vgahw/vgaHWmodule.c:
* hw/xfree86/xaa/xaaInitAccel.c:
* hw/xfree86/xf1bpp/mfbmodule.c:
* hw/xfree86/xf4bpp/vgamodule.c:
* hw/xfree86/xf8_16bpp/xf8_16module.c:
* hw/xfree86/xf8_32bpp/cfb8_32module.c:
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.
2006-06-03 Daniel Stone <daniel@freedesktop.org> 2006-06-03 Daniel Stone <daniel@freedesktop.org>
* configure.ac: * configure.ac:

13
hw/xfree86/ddc/xf86DDC.c
View File

@ -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 /* xf86DDC.c
* *
* Copyright 1998,1999 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> * Copyright 1998,1999 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>
@ -15,9 +13,7 @@
#include "ddcPriv.h" #include "ddcPriv.h"
#include <string.h> #include <string.h>
#ifdef XFree86LOADER
static const OptionInfoRec *DDCAvailableOptions(void *unused); static const OptionInfoRec *DDCAvailableOptions(void *unused);
#endif
const char *i2cSymbols[] = { const char *i2cSymbols[] = {
"xf86CreateI2CDevRec", "xf86CreateI2CDevRec",
@ -28,8 +24,6 @@ const char *i2cSymbols[] = {
NULL NULL
}; };
#ifdef XFree86LOADER
static MODULESETUPPROTO(ddcSetup); static MODULESETUPPROTO(ddcSetup);
static XF86ModuleVersionInfo ddcVersRec = static XF86ModuleVersionInfo ddcVersRec =
@ -46,7 +40,7 @@ static XF86ModuleVersionInfo ddcVersRec =
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData ddcModuleData = { &ddcVersRec, ddcSetup, NULL }; _X_EXPORT XF86ModuleData ddcModuleData = { &ddcVersRec, ddcSetup, NULL };
ModuleInfoRec DDC = { ModuleInfoRec DDC = {
1, 1,
@ -63,9 +57,6 @@ ddcSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if (!setupDone) { if (!setupDone) {
setupDone = TRUE; setupDone = TRUE;
#ifndef REMOVE_LOADER_CHECK_MODULE_INFO
if (xf86LoaderCheckSymbol("xf86AddModuleInfo"))
#endif
xf86AddModuleInfo(&DDC, module); xf86AddModuleInfo(&DDC, module);
/* /*
* Tell the loader about symbols from other modules that this 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; return (pointer)1;
} }
#endif
#define RETRIES 4 #define RETRIES 4
static unsigned char *EDIDRead_DDC1( static unsigned char *EDIDRead_DDC1(

3
hw/xfree86/dixmods/GLcoremodule.c
View File

@ -1,4 +1,3 @@
/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcoremodule.c,v 1.5 2000/02/23 04:46:55 martin Exp $ */
/************************************************************************** /**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@ -54,7 +53,7 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL }; _X_EXPORT XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL };
static pointer static pointer
GLcoreSetup(pointer module, pointer opts, int *errmaj, int *errmin) GLcoreSetup(pointer module, pointer opts, int *errmaj, int *errmin)

7
hw/xfree86/dixmods/afbmodule.c
View File

@ -1,4 +1,3 @@
/* $XFree86: xc/programs/Xserver/afb/afbmodule.c,v 1.1 1999/06/13 13:47:38 dawes Exp $ */
/* /*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved. * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
* *
@ -29,8 +28,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
#include "afb.h" #include "afb.h"
@ -50,7 +47,7 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData afbModuleData = { &VersRec, afbSetup, NULL }; _X_EXPORT XF86ModuleData afbModuleData = { &VersRec, afbSetup, NULL };
static pointer static pointer
afbSetup(pointer module, pointer opts, int *errmaj, int *errmin) afbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@ -59,5 +56,3 @@ afbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
return LoadSubModule(module, "mfb", NULL, NULL, NULL, NULL, return LoadSubModule(module, "mfb", NULL, NULL, NULL, NULL,
errmaj, errmin); errmaj, errmin);
} }
#endif

7
hw/xfree86/dixmods/cfb32module.c
View File

@ -1,4 +1,3 @@
/* $XFree86: xc/programs/Xserver/cfb32/cfbmodule.c,v 1.8 1999/01/26 05:53:49 dawes Exp $ */
/* /*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved. * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
* *
@ -31,8 +30,6 @@
#define PSZ 32 #define PSZ 32
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
#include "cfb.h" #include "cfb.h"
@ -52,7 +49,7 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData cfb32ModuleData = { &VersRec, cfb32Setup, NULL }; _X_EXPORT XF86ModuleData cfb32ModuleData = { &VersRec, cfb32Setup, NULL };
static pointer static pointer
cfb32Setup(pointer module, pointer opts, int *errmaj, int *errmin) cfb32Setup(pointer module, pointer opts, int *errmaj, int *errmin)
@ -61,5 +58,3 @@ cfb32Setup(pointer module, pointer opts, int *errmaj, int *errmin)
return LoadSubModule(module, "cfb", NULL, NULL, NULL, NULL, return LoadSubModule(module, "cfb", NULL, NULL, NULL, NULL,
errmaj, errmin); errmaj, errmin);
} }
#endif

7
hw/xfree86/dixmods/cfbmodule.c
View File

@ -1,4 +1,3 @@
/* $XFree86: xc/programs/Xserver/cfb/cfbmodule.c,v 1.8 1999/01/26 05:53:48 dawes Exp $ */
/* /*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved. * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
* *
@ -31,8 +30,6 @@
#define PSZ 8 #define PSZ 8
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
#include "cfb.h" #include "cfb.h"
@ -52,7 +49,7 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData cfbModuleData = { &VersRec, cfbSetup, NULL }; _X_EXPORT XF86ModuleData cfbModuleData = { &VersRec, cfbSetup, NULL };
static pointer static pointer
cfbSetup(pointer module, pointer opts, int *errmaj, int *errmin) cfbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@ -61,5 +58,3 @@ cfbSetup(pointer module, pointer opts, int *errmaj, int *errmin)
return LoadSubModule(module, "mfb", NULL, NULL, NULL, NULL, return LoadSubModule(module, "mfb", NULL, NULL, NULL, NULL,
errmaj, errmin); errmaj, errmin);
} }
#endif

6
hw/xfree86/dixmods/dbemodule.c
View File

@ -1,5 +1,3 @@
/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.6 1999/01/26 05:53:50 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
@ -11,7 +9,7 @@ static MODULESETUPPROTO(dbeSetup);
extern void DbeExtensionInit(INITARGS); extern void DbeExtensionInit(INITARGS);
ExtensionModule dbeExt = { static ExtensionModule dbeExt = {
DbeExtensionInit, DbeExtensionInit,
"DOUBLE-BUFFER", "DOUBLE-BUFFER",
&noDbeExtension, &noDbeExtension,
@ -36,7 +34,7 @@ static XF86ModuleVersionInfo VersRec =
/* /*
* Data for the loader * Data for the loader
*/ */
XF86ModuleData dbeModuleData = { &VersRec, dbeSetup, NULL }; _X_EXPORT XF86ModuleData dbeModuleData = { &VersRec, dbeSetup, NULL };
static pointer static pointer
dbeSetup(pointer module, pointer opts, int *errmaj, int *errmin) dbeSetup(pointer module, pointer opts, int *errmaj, int *errmin)

11
hw/xfree86/dixmods/extmod/modinit.c
View File

@ -1,7 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.16 2002/03/06 21:12:33 mvojkovi Exp $ */
/* /*
*
* Copyright (c) 1997 Matthieu Herrb * Copyright (c) 1997 Matthieu Herrb
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its
@ -27,8 +24,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
#include "xf86Opt.h" #include "xf86Opt.h"
@ -42,7 +37,7 @@ static MODULESETUPPROTO(extmodSetup);
/* /*
* Array describing extensions to be initialized * Array describing extensions to be initialized
*/ */
ExtensionModule extensionModules[] = { static ExtensionModule extensionModules[] = {
#ifdef SHAPE #ifdef SHAPE
{ {
ShapeExtensionInit, ShapeExtensionInit,
@ -229,7 +224,7 @@ static XF86ModuleVersionInfo VersRec =
/* /*
* Data for the loader * Data for the loader
*/ */
XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL }; _X_EXPORT XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };
static pointer static pointer
extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin) extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@ -259,5 +254,3 @@ extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
/* Need a non-NULL return */ /* Need a non-NULL return */
return (pointer)1; return (pointer)1;
} }
#endif /* XFree86LOADER */

7
hw/xfree86/dixmods/fbmodule.c
View File

@ -23,14 +23,11 @@
* dealings in this Software without prior written authorization from the * dealings in this Software without prior written authorization from the
* XFree86 Project. * XFree86 Project.
*/ */
/* $XFree86: xc/programs/Xserver/fb/fbmodule.c,v 1.3 2000/02/14 19:20:29 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
#include "fb.h" #include "fb.h"
@ -48,6 +45,4 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData fbModuleData = { &VersRec, NULL, NULL }; _X_EXPORT XF86ModuleData fbModuleData = { &VersRec, NULL, NULL };
#endif

13
hw/xfree86/dixmods/ftmodule.c
View File

@ -23,17 +23,16 @@
* dealings in this Software without prior written authorization from the * dealings in this Software without prior written authorization from the
* XFree86 Project. * XFree86 Project.
*/ */
/* $XFree86: xc/lib/font/FreeType/module/ftmodule.c,v 1.18 2003/11/02 04:30:57 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include "misc.h" #include "misc.h"
#include <X11/fonts/fontmod.h> #include <X11/fonts/fontmod.h>
#include "xf86Module.h" #include "xf86Module.h"
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
static MODULESETUPPROTO(freetypeSetup); static MODULESETUPPROTO(freetypeSetup);
/* /*
@ -55,11 +54,11 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData freetypeModuleData = { &VersRec, freetypeSetup, NULL }; _X_EXPORT XF86ModuleData freetypeModuleData = { &VersRec, freetypeSetup, NULL };
extern void FreeTypeRegisterFontFileFunctions(void); extern void FreeTypeRegisterFontFileFunctions(void);
FontModule freetypeModule = { static FontModule freetypeModule = {
FreeTypeRegisterFontFileFunctions, FreeTypeRegisterFontFileFunctions,
"FreeType", "FreeType",
NULL NULL

5
hw/xfree86/dixmods/glxmodule.c
View File

@ -24,7 +24,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/ **************************************************************************/
/* $XFree86: xc/programs/Xserver/GL/glxmodule.c,v 1.11 2001/06/15 21:22:38 dawes Exp $ */
/* /*
* Authors: * Authors:
@ -59,7 +58,7 @@ static MODULESETUPPROTO(glxSetup);
static const char *initdeps[] = { "DOUBLE-BUFFER", NULL }; static const char *initdeps[] = { "DOUBLE-BUFFER", NULL };
ExtensionModule GLXExt = static ExtensionModule GLXExt =
{ {
GlxExtensionInit, GlxExtensionInit,
"GLX", "GLX",
@ -82,7 +81,7 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData glxModuleData = { &VersRec, glxSetup, NULL }; _X_EXPORT XF86ModuleData glxModuleData = { &VersRec, glxSetup, NULL };
/* We do a little proxy dance here, so we can avoid loading GLcore /* We do a little proxy dance here, so we can avoid loading GLcore
* unless we really need to.*/ * unless we really need to.*/

7
hw/xfree86/dixmods/mfbmodule.c
View File

@ -1,4 +1,3 @@
/* $XFree86: xc/programs/Xserver/mfb/mfbmodule.c,v 1.7 1999/01/26 05:54:21 dawes Exp $ */
/* /*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved. * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
* *
@ -29,10 +28,8 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
static XF86ModuleVersionInfo VersRec = static XF86ModuleVersionInfo VersRec =
{ {
"mfb", "mfb",
@ -47,6 +44,4 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData mfbModuleData = { &VersRec, NULL, NULL }; _X_EXPORT XF86ModuleData mfbModuleData = { &VersRec, NULL, NULL };
#endif

6
hw/xfree86/dixmods/recordmod.c
View File

@ -1,5 +1,3 @@
/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.5 1999/01/26 05:54:21 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
@ -12,7 +10,7 @@ static MODULESETUPPROTO(recordSetup);
extern void RecordExtensionInit(INITARGS); extern void RecordExtensionInit(INITARGS);
ExtensionModule recordExt = { static ExtensionModule recordExt = {
RecordExtensionInit, RecordExtensionInit,
"RECORD", "RECORD",
&noTestExtensions, &noTestExtensions,
@ -33,7 +31,7 @@ static XF86ModuleVersionInfo VersRec = {
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL }; _X_EXPORT XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL };
static pointer static pointer
recordSetup(pointer module, pointer opts, int *errmaj, int *errmin) recordSetup(pointer module, pointer opts, int *errmaj, int *errmin)

8
hw/xfree86/dixmods/shmodule.c
View File

@ -1,6 +1,4 @@
/* /*
* $XFree86$
*
* Copyright © 2000 Keith Packard * Copyright © 2000 Keith Packard
* *
* Permission to use, copy, modify, distribute, and sell this software and its * Permission to use, copy, modify, distribute, and sell this software and its
@ -26,8 +24,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
#include <X11/X.h> #include <X11/X.h>
#include "scrnintstr.h" #include "scrnintstr.h"
@ -55,6 +51,4 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData shadowModuleData = { &VersRec, NULL, NULL }; _X_EXPORT XF86ModuleData shadowModuleData = { &VersRec, NULL, NULL };
#endif

11
hw/xfree86/dixmods/type1mod.c
View File

@ -23,17 +23,16 @@
* dealings in this Software without prior written authorization from the * dealings in this Software without prior written authorization from the
* XFree86 Project. * XFree86 Project.
*/ */
/* $XFree86: xc/lib/font/Type1/module/type1mod.c,v 1.10 2002/12/09 17:29:59 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include "misc.h" #include "misc.h"
#include <X11/fonts/fontmod.h> #include <X11/fonts/fontmod.h>
#include "xf86Module.h" #include "xf86Module.h"
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
static MODULESETUPPROTO(type1Setup); static MODULESETUPPROTO(type1Setup);
/* /*
@ -55,7 +54,7 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData type1ModuleData = { &VersRec, type1Setup, NULL }; _X_EXPORT XF86ModuleData type1ModuleData = { &VersRec, type1Setup, NULL };
extern void Type1RegisterFontFileFunctions(void); extern void Type1RegisterFontFileFunctions(void);
#ifdef BUILDCID #ifdef BUILDCID

12
hw/xfree86/dixmods/xf86XTrapModule.c
View File

@ -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 #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
@ -12,11 +10,9 @@
extern void DEC_XTRAPInit(INITARGS); extern void DEC_XTRAPInit(INITARGS);
#ifdef XFree86LOADER
static MODULESETUPPROTO(xtrapSetup); static MODULESETUPPROTO(xtrapSetup);
ExtensionModule xtrapExt = static ExtensionModule xtrapExt =
{ {
DEC_XTRAPInit, DEC_XTRAPInit,
XTrapExtName, XTrapExtName,
@ -39,7 +35,7 @@ static XF86ModuleVersionInfo xtrapVersRec =
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData xtrapModuleData = { &xtrapVersRec, xtrapSetup, NULL }; _X_EXPORT XF86ModuleData xtrapModuleData = { &xtrapVersRec, xtrapSetup, NULL };
static pointer static pointer
xtrapSetup(pointer module, pointer opts, int *errmaj, int *errmin) { 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 */ /* Need a non-NULL return value to indicate success */
return (pointer)1; return (pointer)1;
} }
#endif /* XFree86LOADER */

6
hw/xfree86/dri/drimodule.c
View File

@ -1,4 +1,3 @@
/* $XdotOrg: xc/programs/Xserver/GL/dri/drimodule.c,v 1.2 2004/04/23 18:44:36 eich Exp $ */
/************************************************************************** /**************************************************************************
Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
@ -25,7 +24,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/ **************************************************************************/
/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.5 2001/06/15 21:22:39 dawes Exp $ */
/* /*
* Authors: * Authors:
@ -61,7 +59,7 @@ extern void XFree86DRIExtensionInit(INITARGS);
#define _XF86DRI_SERVER_ #define _XF86DRI_SERVER_
#include "xf86dristr.h" #include "xf86dristr.h"
ExtensionModule XF86DRIExt = static ExtensionModule XF86DRIExt =
{ {
XFree86DRIExtensionInit, XFree86DRIExtensionInit,
XF86DRINAME, XF86DRINAME,
@ -96,7 +94,7 @@ static const char *drmSymbols[] = {
NULL NULL
}; };
XF86ModuleData driModuleData = { &VersRec, driSetup, NULL }; _X_EXPORT XF86ModuleData driModuleData = { &VersRec, driSetup, NULL };
static pointer static pointer
driSetup(pointer module, pointer opts, int *errmaj, int *errmin) driSetup(pointer module, pointer opts, int *errmaj, int *errmin)

7
hw/xfree86/exa/examodule.c
View File

@ -168,9 +168,9 @@ static XF86ModuleVersionInfo exaVersRec =
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData exaModuleData = { &exaVersRec, exaSetup, NULL }; _X_EXPORT XF86ModuleData exaModuleData = { &exaVersRec, exaSetup, NULL };
ModuleInfoRec EXA = { static ModuleInfoRec EXA = {
1, 1,
"EXA", "EXA",
NULL, NULL,
@ -186,9 +186,6 @@ exaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
if (!Initialised) { if (!Initialised) {
Initialised = TRUE; Initialised = TRUE;
#ifndef REMOVE_LOADER_CHECK_MODULE_INFO
if (xf86LoaderCheckSymbol("xf86AddModuleInfo"))
#endif
xf86AddModuleInfo(&EXA, Module); xf86AddModuleInfo(&EXA, Module);
} }

11
hw/xfree86/fbdevhw/fbdevhw.c
View File

@ -1,5 +1,3 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.32 2003/08/26 10:57:03 daenzer Exp $ */
/* all driver need this */ /* all driver need this */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
@ -42,8 +40,6 @@
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
#ifdef XFree86LOADER
static MODULESETUPPROTO(fbdevhwSetup); static MODULESETUPPROTO(fbdevhwSetup);
static XF86ModuleVersionInfo fbdevHWVersRec = static XF86ModuleVersionInfo fbdevHWVersRec =
@ -60,7 +56,11 @@ static XF86ModuleVersionInfo fbdevHWVersRec =
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData fbdevhwModuleData = { &fbdevHWVersRec, fbdevhwSetup, NULL }; _X_EXPORT XF86ModuleData fbdevhwModuleData = {
&fbdevHWVersRec,
fbdevhwSetup,
NULL
};
static pointer static pointer
fbdevhwSetup(pointer module, pointer opts, int *errmaj, int *errmin) fbdevhwSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@ -80,7 +80,6 @@ fbdevhwSetup(pointer module, pointer opts, int *errmaj, int *errmin)
return (pointer)1; return (pointer)1;
} }
} }
#endif /* XFree86LOADER */
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>

1
hw/xfree86/i2c/bt829_module.c
View File

@ -6,7 +6,6 @@
static MODULESETUPPROTO(bt829Setup); static MODULESETUPPROTO(bt829Setup);
static XF86ModuleVersionInfo bt829VersRec = static XF86ModuleVersionInfo bt829VersRec =
{ {
"bt829", "bt829",

1
hw/xfree86/i2c/fi1236_module.c
View File

@ -6,7 +6,6 @@
static MODULESETUPPROTO(fi1236Setup); static MODULESETUPPROTO(fi1236Setup);
static XF86ModuleVersionInfo fi1236VersRec = static XF86ModuleVersionInfo fi1236VersRec =
{ {
"fi1236", "fi1236",

1
hw/xfree86/i2c/msp3430_module.c
View File

@ -6,7 +6,6 @@
static MODULESETUPPROTO(msp3430Setup); static MODULESETUPPROTO(msp3430Setup);
static XF86ModuleVersionInfo msp3430VersRec = static XF86ModuleVersionInfo msp3430VersRec =
{ {
"msp3430", "msp3430",

1
hw/xfree86/i2c/tda8425_module.c
View File

@ -6,7 +6,6 @@
static MODULESETUPPROTO(tda8425Setup); static MODULESETUPPROTO(tda8425Setup);
static XF86ModuleVersionInfo tda8425VersRec = static XF86ModuleVersionInfo tda8425VersRec =
{ {
"tda8425", "tda8425",

1
hw/xfree86/i2c/tda9850_module.c
View File

@ -6,7 +6,6 @@
static MODULESETUPPROTO(tda9850Setup); static MODULESETUPPROTO(tda9850Setup);
static XF86ModuleVersionInfo tda9850VersRec = static XF86ModuleVersionInfo tda9850VersRec =
{ {
"tda9850", "tda9850",

1
hw/xfree86/i2c/tda9885_module.c
View File

@ -6,7 +6,6 @@
static MODULESETUPPROTO(tda9885Setup); static MODULESETUPPROTO(tda9885Setup);
static XF86ModuleVersionInfo tda9885VersRec = static XF86ModuleVersionInfo tda9885VersRec =
{ {
"tda9885", "tda9885",

1
hw/xfree86/i2c/uda1380_module.c
View File

@ -6,7 +6,6 @@
static MODULESETUPPROTO(uda1380Setup); static MODULESETUPPROTO(uda1380Setup);
static XF86ModuleVersionInfo uda1380VersRec = static XF86ModuleVersionInfo uda1380VersRec =
{ {
"uda1380", "uda1380",

4
hw/xfree86/i2c/xf86i2cmodule.c
View File

@ -5,8 +5,6 @@
* (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
*/ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.6 1999/01/26 05:54:10 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
@ -29,7 +27,7 @@ static XF86ModuleVersionInfo i2cVersRec =
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData i2cModuleData = { &i2cVersRec, i2cSetup, NULL }; _X_EXPORT XF86ModuleData i2cModuleData = { &i2cVersRec, i2cSetup, NULL };
static pointer static pointer
i2cSetup(pointer module, pointer opts, int *errmaj, int *errmin) { i2cSetup(pointer module, pointer opts, int *errmaj, int *errmin) {

13
hw/xfree86/int10/xf86int10module.c
View File

@ -1,4 +1,3 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/int10/xf86int10module.c,v 1.3 1999/12/03 19:17:41 eich Exp $ */
/* /*
* XFree86 int10 module * XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment * execute BIOS int 10h calls in x86 real mode environment
@ -13,10 +12,6 @@
#include "xf86Pci.h" #include "xf86Pci.h"
#include "xf86int10.h" #include "xf86int10.h"
#ifdef XFree86LOADER
#ifndef MOD_NAME #ifndef MOD_NAME
# define MOD_NAME int10 # define MOD_NAME int10
#endif #endif
@ -43,7 +38,11 @@ static XF86ModuleVersionInfo NAME(VersRec) =
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData NAME(ModuleData) = { &NAME(VersRec), NAME(Setup), NULL }; _X_EXPORT XF86ModuleData NAME(ModuleData) = {
&NAME(VersRec),
NAME(Setup),
NULL
};
static pointer static pointer
NAME(Setup)(pointer module, pointer opts, int *errmaj, int *errmin) NAME(Setup)(pointer module, pointer opts, int *errmaj, int *errmin)
@ -63,5 +62,3 @@ NAME(Setup)(pointer module, pointer opts, int *errmaj, int *errmin)
*/ */
return (pointer)1; return (pointer)1;
} }
#endif

5
hw/xfree86/os-support/drm/drmmodule.c
View File

@ -24,9 +24,6 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
* *
* Authors: Rickard E. (Rik) Faith <faith@valinux.com> * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
*
* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.2 2000/02/23 04:47:22 martin Exp $
*
*/ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
@ -51,7 +48,7 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData drmModuleData = { &VersRec, drmSetup, NULL }; _X_EXPORT XF86ModuleData drmModuleData = { &VersRec, drmSetup, NULL };
static pointer static pointer
drmSetup(pointer module, pointer opts, int *errmaj, int *errmin) drmSetup(pointer module, pointer opts, int *errmaj, int *errmin)

6
hw/xfree86/rac/xf86RACmodule.c
View File

@ -1,5 +1,3 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.3 1999/01/17 10:54:12 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
@ -20,6 +18,4 @@ static XF86ModuleVersionInfo racVersRec =
{0,0,0,0} {0,0,0,0}
}; };
_X_EXPORT XF86ModuleData racModuleData = { &racVersRec, NULL, NULL };
XF86ModuleData racModuleData = { &racVersRec, NULL, NULL };

5
hw/xfree86/ramdac/xf86RamDacMod.c
View File

@ -23,7 +23,6 @@
* *
* Generic RAMDAC module. * Generic RAMDAC module.
*/ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.5 1999/01/17 10:54:13 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
@ -31,7 +30,6 @@
#include "xf86Module.h" #include "xf86Module.h"
static XF86ModuleVersionInfo VersRec = { static XF86ModuleVersionInfo VersRec = {
"ramdac", "ramdac",
MODULEVENDORSTRING, MODULEVENDORSTRING,
@ -45,5 +43,4 @@ static XF86ModuleVersionInfo VersRec = {
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
XF86ModuleData ramdacModuleData = { &VersRec, NULL, NULL }; _X_EXPORT XF86ModuleData ramdacModuleData = { &VersRec, NULL, NULL };

9
hw/xfree86/scanpci/xf86ScanPci.c
View File

@ -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 * Display the Subsystem Vendor Id and Subsystem Id in order to identify
* the cards installed in this computer * the cards installed in this computer
@ -75,8 +74,6 @@
#include "xf86PciIds.h" #include "xf86PciIds.h"
#include "xf86ScanPci.h" #include "xf86ScanPci.h"
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
#ifdef PCIDATA #ifdef PCIDATA
@ -94,7 +91,7 @@ static XF86ModuleVersionInfo pciDataVersRec = {
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
XF86ModuleData pcidataModuleData = { &pciDataVersRec, NULL, NULL }; _X_EXPORT XF86ModuleData pcidataModuleData = { &pciDataVersRec, NULL, NULL };
#else #else
@ -111,12 +108,10 @@ static XF86ModuleVersionInfo scanPciVersRec = {
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
XF86ModuleData scanpciModuleData = { &scanPciVersRec, NULL, NULL }; _X_EXPORT XF86ModuleData scanpciModuleData = { &scanPciVersRec, NULL, NULL };
#endif /* PCIDATA */ #endif /* PCIDATA */
#endif /* XFree86LOADER */
/* Initialisation/Close hooks, in case they're ever needed. */ /* Initialisation/Close hooks, in case they're ever needed. */
Bool Bool
ScanPciSetupPciIds(void) ScanPciSetupPciIds(void)

9
hw/xfree86/shadowfb/sfbmodule.c
View File

@ -1,12 +1,7 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.1 1999/01/31 12:38:06 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
static XF86ModuleVersionInfo VersRec = static XF86ModuleVersionInfo VersRec =
@ -23,6 +18,4 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData shadowfbModuleData = { &VersRec, NULL, NULL }; _X_EXPORT XF86ModuleData shadowfbModuleData = { &VersRec, NULL, NULL };
#endif

9
hw/xfree86/vbe/vbe_module.c
View File

@ -1,5 +1,3 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe_module.c,v 1.4 2002/09/16 18:06:15 eich Exp $ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
@ -10,8 +8,6 @@
extern const char *vbe_ddcSymbols[]; extern const char *vbe_ddcSymbols[];
#ifdef XFree86LOADER
static MODULESETUPPROTO(vbeSetup); static MODULESETUPPROTO(vbeSetup);
static XF86ModuleVersionInfo vbeVersRec = static XF86ModuleVersionInfo vbeVersRec =
@ -28,7 +24,7 @@ static XF86ModuleVersionInfo vbeVersRec =
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData vbeModuleData = { &vbeVersRec, vbeSetup, NULL }; _X_EXPORT XF86ModuleData vbeModuleData = { &vbeVersRec, vbeSetup, NULL };
static pointer static pointer
vbeSetup(pointer module, pointer opts, int *errmaj, int *errmin) vbeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@ -49,6 +45,3 @@ vbeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
*/ */
return (pointer)1; return (pointer)1;
} }
#endif

9
hw/xfree86/vgahw/vgaHWmodule.c
View File

@ -1,5 +1,3 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHWmodule.c,v 1.6 1999/01/26 05:54:18 dawes Exp $ */
/* /*
* Copyright 1998 by The XFree86 Project, Inc * Copyright 1998 by The XFree86 Project, Inc
*/ */
@ -8,11 +6,8 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
static XF86ModuleVersionInfo VersRec = { static XF86ModuleVersionInfo VersRec = {
"vgahw", "vgahw",
MODULEVENDORSTRING, MODULEVENDORSTRING,
@ -26,6 +21,4 @@ static XF86ModuleVersionInfo VersRec = {
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
XF86ModuleData vgahwModuleData = { &VersRec, NULL, NULL }; _X_EXPORT XF86ModuleData vgahwModuleData = { &VersRec, NULL, NULL };
#endif

11
hw/xfree86/xaa/xaaInitAccel.c
View File

@ -1,5 +1,3 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.35tsi Exp $ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
@ -18,9 +16,7 @@
#include "xf86fbman.h" #include "xf86fbman.h"
#include "servermd.h" #include "servermd.h"
#ifdef XFree86LOADER
static const OptionInfoRec *XAAAvailableOptions(void *unused); static const OptionInfoRec *XAAAvailableOptions(void *unused);
#endif
/* /*
* XAA Config options * XAA Config options
@ -97,7 +93,6 @@ static const OptionInfoRec XAAOptions[] = {
OPTV_NONE, {0}, FALSE } OPTV_NONE, {0}, FALSE }
}; };
#ifdef XFree86LOADER
static MODULESETUPPROTO(xaaSetup); static MODULESETUPPROTO(xaaSetup);
static XF86ModuleVersionInfo xaaVersRec = static XF86ModuleVersionInfo xaaVersRec =
@ -114,7 +109,7 @@ static XF86ModuleVersionInfo xaaVersRec =
{0,0,0,0} {0,0,0,0}
}; };
XF86ModuleData xaaModuleData = { &xaaVersRec, xaaSetup, NULL }; _X_EXPORT XF86ModuleData xaaModuleData = { &xaaVersRec, xaaSetup, NULL };
ModuleInfoRec XAA = { ModuleInfoRec XAA = {
1, 1,
@ -132,9 +127,6 @@ xaaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
if (!Initialised) { if (!Initialised) {
Initialised = TRUE; Initialised = TRUE;
#ifndef REMOVE_LOADER_CHECK_MODULE_INFO
if (xf86LoaderCheckSymbol("xf86AddModuleInfo"))
#endif
xf86AddModuleInfo(&XAA, Module); xf86AddModuleInfo(&XAA, Module);
} }
@ -147,7 +139,6 @@ XAAAvailableOptions(void *unused)
{ {
return (XAAOptions); return (XAAOptions);
} }
#endif
Bool Bool
XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec) XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)

7
hw/xfree86/xf1bpp/mfbmodule.c
View File

@ -1,4 +1,3 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmodule.c,v 1.6 1999/01/26 05:54:19 dawes Exp $ */
/* /*
* Copyright (C) 1997 The XFree86 Project, Inc. All Rights Reserved. * Copyright (C) 1997 The XFree86 Project, Inc. All Rights Reserved.
* *
@ -29,10 +28,8 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
static XF86ModuleVersionInfo VersRec = static XF86ModuleVersionInfo VersRec =
{ {
"xf1bpp", "xf1bpp",
@ -47,6 +44,4 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData xf1bppModuleData = { &VersRec, NULL, NULL }; _X_EXPORT XF86ModuleData xf1bppModuleData = { &VersRec, NULL, NULL };
#endif

6
hw/xfree86/xf4bpp/vgamodule.c
View File

@ -1,4 +1,3 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgamodule.c,v 1.8 1999/01/26 05:54:20 dawes Exp $ */
/* /*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved. * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
* *
@ -29,7 +28,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
static MODULESETUPPROTO(xf4bppSetup); static MODULESETUPPROTO(xf4bppSetup);
@ -48,7 +46,7 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData xf4bppModuleData = { &VersRec, xf4bppSetup, NULL }; _X_EXPORT XF86ModuleData xf4bppModuleData = { &VersRec, xf4bppSetup, NULL };
static pointer static pointer
xf4bppSetup(pointer module, pointer opts, int *errmaj, int *errmin) xf4bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@ -57,5 +55,3 @@ xf4bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)
return LoadSubModule(module, "xf1bpp", NULL, NULL, NULL, NULL, return LoadSubModule(module, "xf1bpp", NULL, NULL, NULL, NULL,
errmaj, errmin); errmaj, errmin);
} }
#endif

2
hw/xfree86/xf8_16bpp/xf8_16module.c
View File

@ -46,7 +46,6 @@ cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
dpix, dpiy, width16, width8, 16, 8, 16, 8)); dpix, dpiy, width16, width8, 16, 8, 16, 8));
} }
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
static MODULESETUPPROTO(xf8_16bppSetup); static MODULESETUPPROTO(xf8_16bppSetup);
@ -76,4 +75,3 @@ xf8_16bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)
return (pointer)LoadSubModule(module, "fb", NULL, NULL, NULL, NULL, return (pointer)LoadSubModule(module, "fb", NULL, NULL, NULL, NULL,
errmaj, errmin); errmaj, errmin);
} }
#endif

13
hw/xfree86/xf8_32bpp/cfb8_32module.c
View File

@ -1,12 +1,7 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.5 1999/01/24 13:32:42 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"
static MODULESETUPPROTO(xf8_32bppSetup); static MODULESETUPPROTO(xf8_32bppSetup);
@ -25,7 +20,11 @@ static XF86ModuleVersionInfo VersRec =
{0,0,0,0} /* signature, to be patched into the file by a tool */ {0,0,0,0} /* signature, to be patched into the file by a tool */
}; };
XF86ModuleData xf8_32bppModuleData = { &VersRec, xf8_32bppSetup, NULL }; _X_EXPORT XF86ModuleData xf8_32bppModuleData = {
&VersRec,
xf8_32bppSetup,
NULL
};
static pointer static pointer
xf8_32bppSetup(pointer module, pointer opts, int *errmaj, int *errmin) xf8_32bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@ -38,5 +37,3 @@ xf8_32bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)
return NULL; return NULL;
return (pointer)1; /* non-NULL required to indicate success */ return (pointer)1; /* non-NULL required to indicate success */
} }
#endif