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.

14 files changed, 29 insertions, 81 deletions

diff --git a/hw/xfree86/dixmods/GLcoremodule.c b/hw/xfree86/dixmods/GLcoremodule.c
index 4e03b59fe..d55cb78a7 100644
--- a/hw/xfree86/dixmods/GLcoremodule.c
+++ b/hw/xfree86/dixmods/GLcoremodule.c
@@ -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.
@@ -54,7 +53,7 @@ static XF86ModuleVersionInfo VersRec =
         {0,0,0,0}
 };
 
-XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL };
+_X_EXPORT XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL };
 
 static pointer
 GLcoreSetup(pointer module, pointer opts, int *errmaj, int *errmin)
diff --git a/hw/xfree86/dixmods/afbmodule.c b/hw/xfree86/dixmods/afbmodule.c
index d9cdbf9c3..ee8cf2037 100644
--- a/hw/xfree86/dixmods/afbmodule.c
+++ b/hw/xfree86/dixmods/afbmodule.c
@@ -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.
  *
@@ -29,8 +28,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.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 */
 };
 
-XF86ModuleData afbModuleData = { &VersRec, afbSetup, NULL };
+_X_EXPORT XF86ModuleData afbModuleData = { &VersRec, afbSetup, NULL };
 
 static pointer
 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,
                          errmaj, errmin);
 }
-
-#endif
diff --git a/hw/xfree86/dixmods/cfb32module.c b/hw/xfree86/dixmods/cfb32module.c
index 0ead3ef93..1451594e5 100644
--- a/hw/xfree86/dixmods/cfb32module.c
+++ b/hw/xfree86/dixmods/cfb32module.c
@@ -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.
  *
@@ -31,8 +30,6 @@
 
 #define PSZ 32
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.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 */
 };
 
-XF86ModuleData cfb32ModuleData = { &VersRec, cfb32Setup, NULL };
+_X_EXPORT XF86ModuleData cfb32ModuleData = { &VersRec, cfb32Setup, NULL };
 
 static pointer
 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,
 			 errmaj, errmin);
 }
-
-#endif
diff --git a/hw/xfree86/dixmods/cfbmodule.c b/hw/xfree86/dixmods/cfbmodule.c
index 095bc8416..693fd6177 100644
--- a/hw/xfree86/dixmods/cfbmodule.c
+++ b/hw/xfree86/dixmods/cfbmodule.c
@@ -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.
  *
@@ -31,8 +30,6 @@
 
 #define PSZ 8
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.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 */
 };
 
-XF86ModuleData cfbModuleData = { &VersRec, cfbSetup, NULL };
+_X_EXPORT XF86ModuleData cfbModuleData = { &VersRec, cfbSetup, NULL };
 
 static pointer
 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,
 			 errmaj, errmin);
 }
-
-#endif
diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c
index 62fbcfd21..73639886f 100644
--- a/hw/xfree86/dixmods/dbemodule.c
+++ b/hw/xfree86/dixmods/dbemodule.c
@@ -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
 #include <xorg-config.h>
 #endif
@@ -11,7 +9,7 @@ static MODULESETUPPROTO(dbeSetup);
 
 extern void DbeExtensionInit(INITARGS);
 
-ExtensionModule dbeExt = {
+static ExtensionModule dbeExt = {
     DbeExtensionInit,
     "DOUBLE-BUFFER",
     &noDbeExtension,
@@ -36,7 +34,7 @@ static XF86ModuleVersionInfo VersRec =
 /*
  * Data for the loader
  */
-XF86ModuleData dbeModuleData = { &VersRec, dbeSetup, NULL };
+_X_EXPORT XF86ModuleData dbeModuleData = { &VersRec, dbeSetup, NULL };
 
 static pointer
 dbeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index f71ce6168..acd700694 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -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
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -27,8 +24,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 #include "xf86Opt.h"
 
@@ -42,7 +37,7 @@ static MODULESETUPPROTO(extmodSetup);
 /*
  * Array describing extensions to be initialized
  */
-ExtensionModule extensionModules[] = {
+static ExtensionModule extensionModules[] = {
 #ifdef SHAPE
     {
 	ShapeExtensionInit,
@@ -229,7 +224,7 @@ static XF86ModuleVersionInfo VersRec =
 /*
  * Data for the loader
  */
-XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };
+_X_EXPORT XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };
 
 static pointer
 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 */
     return (pointer)1;
 }
-
-#endif /* XFree86LOADER */
diff --git a/hw/xfree86/dixmods/fbmodule.c b/hw/xfree86/dixmods/fbmodule.c
index 80d99933a..e8e6cd7c6 100644
--- a/hw/xfree86/dixmods/fbmodule.c
+++ b/hw/xfree86/dixmods/fbmodule.c
@@ -23,14 +23,11 @@
  * dealings in this Software without prior written authorization from the
  * 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
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.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 */
 };
 
-XF86ModuleData fbModuleData = { &VersRec, NULL, NULL };
-
-#endif
+_X_EXPORT XF86ModuleData fbModuleData = { &VersRec, NULL, NULL };
diff --git a/hw/xfree86/dixmods/ftmodule.c b/hw/xfree86/dixmods/ftmodule.c
index c2fe79089..382c0b3b7 100644
--- a/hw/xfree86/dixmods/ftmodule.c
+++ b/hw/xfree86/dixmods/ftmodule.c
@@ -23,17 +23,16 @@
  * dealings in this Software without prior written authorization from the
  * 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 <X11/fonts/fontmod.h>
 #include "xf86Module.h"
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 static MODULESETUPPROTO(freetypeSetup);
 
     /*
@@ -55,11 +54,11 @@ static XF86ModuleVersionInfo VersRec =
 	{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);
 
-FontModule freetypeModule = {
+static FontModule freetypeModule = {
     FreeTypeRegisterFontFileFunctions,
     "FreeType",
     NULL
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index 9869b0295..401707abc 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -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.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/GL/glxmodule.c,v 1.11 2001/06/15 21:22:38 dawes Exp $ */
 
 /*
  * Authors:
@@ -59,7 +58,7 @@ static MODULESETUPPROTO(glxSetup);
 
 static const char *initdeps[] = { "DOUBLE-BUFFER", NULL };
 
-ExtensionModule GLXExt =
+static ExtensionModule GLXExt =
 {
     GlxExtensionInit,
     "GLX",
@@ -82,7 +81,7 @@ static XF86ModuleVersionInfo VersRec =
         {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
  * unless we really need to.*/
diff --git a/hw/xfree86/dixmods/mfbmodule.c b/hw/xfree86/dixmods/mfbmodule.c
index be3b9eed0..91539d709 100644
--- a/hw/xfree86/dixmods/mfbmodule.c
+++ b/hw/xfree86/dixmods/mfbmodule.c
@@ -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.
  *
@@ -29,10 +28,8 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
 #include "xf86Module.h"
 
-
 static XF86ModuleVersionInfo VersRec =
 {
 	"mfb",
@@ -47,6 +44,4 @@ static XF86ModuleVersionInfo VersRec =
 	{0,0,0,0}       /* signature, to be patched into the file by a tool */
 };
 
-XF86ModuleData mfbModuleData = { &VersRec, NULL, NULL };
-
-#endif
+_X_EXPORT XF86ModuleData mfbModuleData = { &VersRec, NULL, NULL };
diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c
index 5afb1d379..63d340e75 100644
--- a/hw/xfree86/dixmods/recordmod.c
+++ b/hw/xfree86/dixmods/recordmod.c
@@ -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
 #include <xorg-config.h>
 #endif
@@ -12,7 +10,7 @@ static MODULESETUPPROTO(recordSetup);
 
 extern void RecordExtensionInit(INITARGS);
 
-ExtensionModule recordExt = {
+static ExtensionModule recordExt = {
     RecordExtensionInit,
     "RECORD",
     &noTestExtensions,
@@ -33,7 +31,7 @@ static XF86ModuleVersionInfo VersRec = {
 	{0,0,0,0}
 };
 
-XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL };
+_X_EXPORT XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL };
 
 static pointer
 recordSetup(pointer module, pointer opts, int *errmaj, int *errmin)
diff --git a/hw/xfree86/dixmods/shmodule.c b/hw/xfree86/dixmods/shmodule.c
index 98021e740..3136c0c05 100644
--- a/hw/xfree86/dixmods/shmodule.c
+++ b/hw/xfree86/dixmods/shmodule.c
@@ -1,6 +1,4 @@
 /*
- * $XFree86$
- *
  * Copyright © 2000 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -26,8 +24,6 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef XFree86LOADER
-
 #include "xf86Module.h"
 #include    <X11/X.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 */
 };
 
-XF86ModuleData shadowModuleData = { &VersRec, NULL, NULL };
-
-#endif
+_X_EXPORT XF86ModuleData shadowModuleData = { &VersRec, NULL, NULL };
diff --git a/hw/xfree86/dixmods/type1mod.c b/hw/xfree86/dixmods/type1mod.c
index e652591a2..48c1d0421 100644
--- a/hw/xfree86/dixmods/type1mod.c
+++ b/hw/xfree86/dixmods/type1mod.c
@@ -23,17 +23,16 @@
  * dealings in this Software without prior written authorization from the
  * 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 <X11/fonts/fontmod.h>
 #include "xf86Module.h"
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 static MODULESETUPPROTO(type1Setup);
 
     /*
@@ -55,7 +54,7 @@ static XF86ModuleVersionInfo VersRec =
 	{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);
 #ifdef BUILDCID
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 */