summaryrefslogtreecommitdiff
authorDavid Nusinow <dnusinow@debian.org>2007-08-21 01:09:27 (GMT)
committer David Nusinow <dnusinow@debian.org>2007-08-21 01:09:27 (GMT)
commitc839859d1bc35451923a2cbd5dfac4f3ca5eb3f9 (patch) (side-by-side diff)
treed4238fa4fa967af892bc9f44810fe3f9e1367486
parent53c04351c462d2ae307684e50d5960debe1ee557 (diff)
downloadxserver-c839859d1bc35451923a2cbd5dfac4f3ca5eb3f9.zip
xserver-c839859d1bc35451923a2cbd5dfac4f3ca5eb3f9.tar.gz
Move module defaults from the header to the source file.
This is where they should have been in the first place. All the rest of the code in the server defines such things in the source files, not the headers.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xfree86/common/xf86Config.c12
-rw-r--r--hw/xfree86/common/xf86Config.h11
2 files changed, 12 insertions, 11 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 3c29497..4773715 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -114,6 +114,18 @@ extern DeviceAssocRec mouse_assoc;
static char *fontPath = NULL;
+static ModuleDefault ModuleDefaults[] = {
+ {.name = "extmod", .toLoad = TRUE, .load_opt=NULL},
+ {.name = "dbe", .toLoad = TRUE, .load_opt=NULL},
+ {.name = "glx", .toLoad = TRUE, .load_opt=NULL},
+ {.name = "freetype", .toLoad = TRUE, .load_opt=NULL},
+ {.name = "type1", .toLoad = TRUE, .load_opt=NULL},
+ {.name = "record", .toLoad = TRUE, .load_opt=NULL},
+ {.name = "dri", .toLoad = TRUE, .load_opt=NULL},
+ {.name = NULL, .toLoad = FALSE, .load_opt=NULL}
+};
+
+
/* Forward declarations */
static Bool configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen,
int scrnum, MessageType from);
diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h
index 7fc161d..b8b5fd4 100644
--- a/hw/xfree86/common/xf86Config.h
+++ b/hw/xfree86/common/xf86Config.h
@@ -54,17 +54,6 @@ typedef struct _ModuleDefault {
XF86OptionPtr load_opt;
} ModuleDefault;
-static ModuleDefault ModuleDefaults[] = {
- {.name = "extmod", .toLoad = TRUE, .load_opt=NULL},
- {.name = "dbe", .toLoad = TRUE, .load_opt=NULL},
- {.name = "glx", .toLoad = TRUE, .load_opt=NULL},
- {.name = "freetype", .toLoad = TRUE, .load_opt=NULL},
- {.name = "type1", .toLoad = TRUE, .load_opt=NULL},
- {.name = "record", .toLoad = TRUE, .load_opt=NULL},
- {.name = "dri", .toLoad = TRUE, .load_opt=NULL},
- {.name = NULL, .toLoad = FALSE, .load_opt=NULL}
-};
-
/*
* prototypes
*/