diff options
| -rw-r--r-- | dix/main.c | 1 | ||||
| -rw-r--r-- | hw/dmx/dmxinit.c | 7 | ||||
| -rw-r--r-- | hw/kdrive/src/kdrive.c | 2 | ||||
| -rw-r--r-- | hw/vfb/InitOutput.c | 5 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 5 | ||||
| -rw-r--r-- | hw/xgl/glx/xglxinit.c | 4 | ||||
| -rw-r--r-- | hw/xgl/xglinit.c | 4 | ||||
| -rw-r--r-- | hw/xnest/Args.c | 10 | ||||
| -rw-r--r-- | hw/xquartz/darwin.c | 9 | ||||
| -rw-r--r-- | hw/xwin/InitOutput.c | 5 | ||||
| -rw-r--r-- | include/os.h | 4 | ||||
| -rw-r--r-- | mi/miinitext.c | 1 | ||||
| -rw-r--r-- | os/utils.c | 11 |
13 files changed, 1 insertions, 67 deletions
diff --git a/dix/main.c b/dix/main.c index 2e12b709f..1972fd913 100644 --- a/dix/main.c +++ b/dix/main.c @@ -246,7 +246,6 @@ int main(int argc, char *argv[], char *envp[]) display = "0"; - InitGlobals(); InitRegions(); CheckUserParameters(argc, argv, envp); diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index 29dc00575..366bd1423 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -873,13 +873,6 @@ void OsVendorFatalError(void) { } -/** This funciton is called by InitGlobals from Xserver/os/utils.c to - * initialize any ddx specific globals at a very early point in the - * server startup. */ -void ddxInitGlobals(void) -{ -} - /** Process our command line arguments. */ int ddxProcessArgument(int argc, char *argv[], int i) { diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index e2ee4adea..51dc633f7 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -1412,5 +1412,3 @@ DPMSSupported (void) } #endif -void ddxInitGlobals(void) { /* THANK YOU XPRINT */ } - diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 1edceb930..bdd1f934f 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -266,11 +266,6 @@ ddxUseMsg() #endif } -/* ddxInitGlobals - called by |InitGlobals| from os/util.c */ -void ddxInitGlobals(void) -{ -} - int ddxProcessArgument(int argc, char *argv[], int i) { diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 4e1f6d6b3..6d123d690 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1696,11 +1696,6 @@ ddxProcessArgument(int argc, char **argv, int i) return xf86ProcessArgument(argc, argv, i); } -/* ddxInitGlobals - called by |InitGlobals| from os/util.c */ -void ddxInitGlobals(void) -{ -} - /* * ddxUseMsg -- * Print out correct use of device dependent commandline options. diff --git a/hw/xgl/glx/xglxinit.c b/hw/xgl/glx/xglxinit.c index b87e5d682..0348d1fe8 100644 --- a/hw/xgl/glx/xglxinit.c +++ b/hw/xgl/glx/xglxinit.c @@ -166,7 +166,3 @@ OsVendorInit (void) { xglxOsVendorInit (); } - -void ddxInitGlobals() -{ -} diff --git a/hw/xgl/xglinit.c b/hw/xgl/xglinit.c index e0c9e7ded..f170e92f0 100644 --- a/hw/xgl/xglinit.c +++ b/hw/xgl/xglinit.c @@ -330,7 +330,3 @@ OsVendorInit (void) if (xglEnsureDDXModule ()) (*__ddxFunc.osVendorInit) (); } - -void ddxInitGlobals() -{ -} diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 209f175ab..b95f70093 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -49,16 +49,6 @@ int xnestNumScreens = 0; Bool xnestDoDirectColormaps = False; Window xnestParentWindow = 0; -/* ddxInitGlobals - called by |InitGlobals| from os/util.c */ -void ddxInitGlobals(void) -{ -#ifdef COMPOSITE - /* XXX terrible hack */ - extern Bool noCompositeExtension; - noCompositeExtension = TRUE; -#endif -} - int ddxProcessArgument (int argc, char *argv[], int i) { diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 4f3553393..51224b6d1 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -678,15 +678,6 @@ void OsVendorInit(void) /* - * ddxInitGlobals - * Called by InitGlobals() from os/util.c. - */ -void ddxInitGlobals(void) -{ -} - - -/* * ddxProcessArgument * Process device-dependent command line args. Returns 0 if argument is * not device dependent, otherwise Count of number of elements of argv diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index d2159813c..abc35b943 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -920,11 +920,6 @@ ddxUseMsg(void) MB_ICONINFORMATION); } -/* ddxInitGlobals - called by |InitGlobals| from os/util.c */ -void ddxInitGlobals(void) -{ -} - /* See Porting Layer Definition - p. 20 */ /* * Do any global initialization, then initialize each screen. diff --git a/include/os.h b/include/os.h index fd3407718..89c624c38 100644 --- a/include/os.h +++ b/include/os.h @@ -212,8 +212,6 @@ extern SIGVAL GiveUp(int /*sig*/); extern void UseMsg(void); -extern void InitGlobals(void); - extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]); extern int set_font_authorizations( @@ -411,8 +409,6 @@ extern XID GenerateAuthorization( extern void ExpandCommandLine(int * /*pargc*/, char *** /*pargv*/); #endif -extern void ddxInitGlobals(void); - extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/); extern void ddxUseMsg(void); diff --git a/mi/miinitext.c b/mi/miinitext.c index bc8d54e9c..ce57f6939 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -59,6 +59,7 @@ SOFTWARE. #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> +#undef COMPOSITE #undef DPMSExtension #endif diff --git a/os/utils.c b/os/utils.c index 9aa510b4e..f3272d43a 100644 --- a/os/utils.c +++ b/os/utils.c @@ -660,17 +660,6 @@ VerifyDisplayName(const char *d) } /* - * This function is responsible for doing initalisation of any global - * variables at an very early point of server startup (even before - * |ProcessCommandLine()|. - */ -void InitGlobals(void) -{ - ddxInitGlobals(); -} - - -/* * This function parses the command line. Handles device-independent fields * and allows ddx to handle additional fields. It is not allowed to modify * argc or any of the strings pointed to by argv. |