summaryrefslogtreecommitdiff
path: root/hw/xfree86/int10
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-06-05 03:00:24 +0000
committerAdam Jackson <ajax@nwnk.net>2006-06-05 03:00:24 +0000
commit52fc7c8dc70226cc7f03454e9be86a627672295f (patch)
treeecba684625dd0a7c561a261c6fe0fd36515b7af7 /hw/xfree86/int10
parentd22582dc5a070f72d4653e24d1e4ebe4a112276e (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/int10')
-rw-r--r--hw/xfree86/int10/xf86int10module.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/hw/xfree86/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c
index 391c18374..b4e5865da 100644
--- a/hw/xfree86/int10/xf86int10module.c
+++ b/hw/xfree86/int10/xf86int10module.c
@@ -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
* execute BIOS int 10h calls in x86 real mode environment
@@ -13,10 +12,6 @@
#include "xf86Pci.h"
#include "xf86int10.h"
-
-#ifdef XFree86LOADER
-
-
#ifndef MOD_NAME
# define MOD_NAME int10
#endif
@@ -43,7 +38,11 @@ static XF86ModuleVersionInfo NAME(VersRec) =
{0,0,0,0}
};
-XF86ModuleData NAME(ModuleData) = { &NAME(VersRec), NAME(Setup), NULL };
+_X_EXPORT XF86ModuleData NAME(ModuleData) = {
+ &NAME(VersRec),
+ NAME(Setup),
+ NULL
+};
static pointer
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;
}
-
-#endif