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.
This commit is contained in:
parent
53c04351c4
commit
c839859d1b
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue
Block a user