frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config: move config.h to hotplug.h 

Also, move configInitialise to after OsInit, since the next commit will
make it use a timer.
This commit is contained in:
Daniel Stone 2006-12-06 23:21:15 +02:00 committed by Daniel Stone
parent 72e7f2ac6c
commit 0c5dab5c8e
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dix/dispatch.c
View File

@ -130,7 +130,6 @@ int ProcInitialConnection();
#include "dispatch.h" #include "dispatch.h"
#include "swaprep.h" #include "swaprep.h"
#include "swapreq.h" #include "swapreq.h"
#include "config.h"
#ifdef PANORAMIX #ifdef PANORAMIX
#include "panoramiX.h" #include "panoramiX.h"
#include "panoramiXsrv.h" #include "panoramiXsrv.h"

4
dix/main.c
View File

@ -98,7 +98,7 @@ Equipment Corporation.
#include <X11/fonts/font.h> #include <X11/fonts/font.h>
#include "opaque.h" #include "opaque.h"
#include "servermd.h" #include "servermd.h"
#include "config.h" #include "hotplug.h"
#include "site.h" #include "site.h"
#include "dixfont.h" #include "dixfont.h"
#include "extnsionst.h" #include "extnsionst.h"
@ -309,9 +309,9 @@ main(int argc, char *argv[], char *envp[])
DPMSPowerLevel = 0; DPMSPowerLevel = 0;
#endif #endif
InitBlockAndWakeupHandlers(); InitBlockAndWakeupHandlers();
configInitialise();
/* Perform any operating system dependent initializations you'd like */ /* Perform any operating system dependent initializations you'd like */
OsInit(); OsInit();
configInitialise();
if(serverGeneration == 1) if(serverGeneration == 1)
{ {
CreateWellKnownSockets(); CreateWellKnownSockets();

2
include/Makefile.am
View File

@ -7,7 +7,7 @@ sdk_HEADERS = \
closure.h \ closure.h \
colormap.h \ colormap.h \
colormapst.h \ colormapst.h \
config.h \ hotplug.h \
cursor.h \ cursor.h \
cursorstr.h \ cursorstr.h \
dix.h \ dix.h \

0
include/config.h → include/hotplug.h
View File