Bug #3626: _X_EXPORT tags for video and input drivers.

8 files changed, 25 insertions, 13 deletions

diff --git a/src/ati.c b/src/ati.c
index 5f819813..b0912cd9 100644
--- a/src/ati.c
+++ b/src/ati.c
@@ -1,6 +1,6 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ati.c,v 1.23 2003/04/25 14:37:35 tsi Exp $ */
 /*
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -60,7 +60,7 @@
 #include "ativersion.h"
 
 /* The root of all evil... */
-DriverRec ATI =
+_X_EXPORT DriverRec ATI =
 {
     ATI_VERSION_CURRENT,
     "ati",
diff --git a/src/atimisc.c b/src/atimisc.c
index cfbf40fc..c6ba9fbd 100644
--- a/src/atimisc.c
+++ b/src/atimisc.c
@@ -135,7 +135,7 @@ ATISetup
 }
 
 /* The following record must be called atimiscModuleData */
-XF86ModuleData atimiscModuleData =
+_X_EXPORT XF86ModuleData atimiscModuleData =
 {
     &ATIVersionRec,
     ATISetup,
diff --git a/src/atimodule.c b/src/atimodule.c
index 2d10516e..9435f847 100644
--- a/src/atimodule.c
+++ b/src/atimodule.c
@@ -120,7 +120,7 @@ ATISetup
 }
 
 /* The following record must be called atiModuleData */
-XF86ModuleData atiModuleData =
+_X_EXPORT XF86ModuleData atiModuleData =
 {
     &ATIVersionRec,
     ATISetup,
diff --git a/src/r128_misc.c b/src/r128_misc.c
index 8841f34b..c66d8235 100644
--- a/src/r128_misc.c
+++ b/src/r128_misc.c
@@ -1,6 +1,6 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_misc.c,v 1.5 2003/01/01 19:16:35 tsi Exp $ */
 /*
- * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -38,7 +38,7 @@ static XF86ModuleVersionInfo R128VersionRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     R128_VERSION_MAJOR, R128_VERSION_MINOR, R128_VERSION_PATCH,
     ABI_CLASS_VIDEODRV,
     ABI_VIDEODRV_VERSION,
@@ -77,7 +77,7 @@ R128Setup
 }
 
 /* The following record must be called r128ModuleData */
-XF86ModuleData r128ModuleData =
+_X_EXPORT XF86ModuleData r128ModuleData =
 {
     &R128VersionRec,
     R128Setup,
diff --git a/src/radeon_misc.c b/src/radeon_misc.c
index d9c978fe..32253e6b 100644
--- a/src/radeon_misc.c
+++ b/src/radeon_misc.c
@@ -1,6 +1,6 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_misc.c,v 1.7 2003/01/01 19:16:35 tsi Exp $ */
 /*
- * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -38,7 +38,7 @@ static XF86ModuleVersionInfo RADEONVersionRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     RADEON_VERSION_MAJOR, RADEON_VERSION_MINOR, RADEON_VERSION_PATCH,
     ABI_CLASS_VIDEODRV,
     ABI_VIDEODRV_VERSION,
@@ -76,7 +76,7 @@ RADEONSetup
 }
 
 /* The following record must be called radeonModuleData */
-XF86ModuleData radeonModuleData =
+_X_EXPORT XF86ModuleData radeonModuleData =
 {
     &RADEONVersionRec,
     RADEONSetup,
diff --git a/src/theatre200_module.c b/src/theatre200_module.c
index 369fbb09..decc2da8 100644
--- a/src/theatre200_module.c
+++ b/src/theatre200_module.c
@@ -18,7 +18,11 @@ static XF86ModuleVersionInfo theatre200VersRec =
         {0,0,0,0}
 };
  
-XF86ModuleData theatre200ModuleData = { &theatre200VersRec, theatre200Setup, NULL }; 
+_X_EXPORT XF86ModuleData theatre200ModuleData = {
+        &theatre200VersRec,
+        theatre200Setup,
+        NULL
+}; 
 
 static pointer
 theatre200Setup(pointer module, pointer opts, int *errmaj, int *errmin) {
diff --git a/src/theatre_detect_module.c b/src/theatre_detect_module.c
index 02180ab2..e426d850 100644
--- a/src/theatre_detect_module.c
+++ b/src/theatre_detect_module.c
@@ -21,7 +21,11 @@ static XF86ModuleVersionInfo theatre_detectVersRec =
         {0,0,0,0}
 };
  
-XF86ModuleData theatre_detectModuleData = { &theatre_detectVersRec, theatre_detectSetup, NULL }; 
+_X_EXPORT XF86ModuleData theatre_detectModuleData = {
+        &theatre_detectVersRec,
+        theatre_detectSetup,
+        NULL
+}; 
 
 static pointer
 theatre_detectSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
diff --git a/src/theatre_module.c b/src/theatre_module.c
index dd1c9afb..015ce2ba 100644
--- a/src/theatre_module.c
+++ b/src/theatre_module.c
@@ -18,7 +18,11 @@ static XF86ModuleVersionInfo theatreVersRec =
         {0,0,0,0}
 };
  
-XF86ModuleData theatreModuleData = { &theatreVersRec, theatreSetup, NULL }; 
+_X_EXPORT XF86ModuleData theatreModuleData = {
+        &theatreVersRec,
+        theatreSetup,
+        NULL
+}; 
 
 static pointer
 theatreSetup(pointer module, pointer opts, int *errmaj, int *errmin) {