summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/common/xf86Module.h
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/common/xf86Module.h')
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Module.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Module.h b/xc/programs/Xserver/hw/xfree86/common/xf86Module.h
index 51c50f411..9917cb21f 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Module.h
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Module.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Module.h,v 1.17 1999/07/06 11:38:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Module.h,v 1.20 2000/02/08 13:13:05 eich Exp $ */
/*
* Copyright (c) 1997-1999 by The XFree86 Project, Inc.
@@ -149,12 +149,13 @@ typedef void (*InitExtension)(INITARGS);
typedef struct {
InitExtension initFunc;
- char * name;
+ const char * name;
Bool *disablePtr;
InitExtension setupFunc;
+ const char ** initDependencies;
} ExtensionModule;
-extern ExtensionModule extension[];
+extern ExtensionModule *ExtensionModuleList;
/* Prototypes for Loader functions that are exported to modules */
#ifndef IN_LOADER
@@ -164,12 +165,13 @@ pointer LoadSubModule(pointer, const char *, const char **,
int *, int *);
void UnloadSubModule(pointer);
void LoadFont(pointer);
+void UnloadModule (pointer);
#endif
pointer LoaderSymbol(const char *);
char **LoaderListDirs(const char **, const char **);
void LoaderFreeDirList(char **);
void LoaderErrorMsg(const char *, const char *, int, int);
-void LoadExtension(ExtensionModule *);
+void LoadExtension(ExtensionModule *, Bool);
void LoaderRefSymLists(const char **, ...);
void LoaderRefSymbols(const char *, ...);
void LoaderReqSymLists(const char **, ...);