diff options
Diffstat (limited to 'xorg-server/os/osinit.c')
| -rw-r--r-- | xorg-server/os/osinit.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c index 1bc8624dc..74e2457f2 100644 --- a/xorg-server/os/osinit.c +++ b/xorg-server/os/osinit.c @@ -55,9 +55,7 @@ SOFTWARE. #include "osdep.h" #include <X11/Xos.h> -#ifdef SMART_SCHEDULE #include "dixstruct.h" -#endif #ifndef PATH_MAX #ifdef MAXPATHLEN @@ -67,11 +65,11 @@ SOFTWARE. #endif #endif -#if defined(Lynx) || defined(__SCO__) +#if defined(__SCO__) #include <sys/wait.h> #endif -#if !defined(SYSV) && !defined(WIN32) && !defined(Lynx) && !defined(QNX4) +#if !defined(SYSV) && !defined(WIN32) #include <sys/resource.h> #endif @@ -90,8 +88,6 @@ int limitStackSpace = -1; int limitNoFile = -1; #endif -Bool OsDelayInitColors = FALSE; - void OsInit(void) { @@ -143,15 +139,8 @@ OsInit(void) #endif } -#ifndef X_NOT_POSIX if (getpgrp () == 0) setpgid (0, 0); -#else -#if !defined(SYSV) && !defined(WIN32) - if (getpgrp (0) == 0) - setpgrp (0, getpid ()); -#endif -#endif #ifdef RLIMIT_DATA if (limitDataSpace >= 0) @@ -198,36 +187,26 @@ OsInit(void) } } #endif -#ifdef SERVER_LOCK LockServer(); -#endif been_here = TRUE; } TimerInit(); -#ifdef DDXOSINIT OsVendorInit(); -#endif /* * No log file by default. OsVendorInit() should call LogInit() with the * log file name if logging to a file is desired. */ LogInit(NULL, NULL); -#ifdef SMART_SCHEDULE if (!SmartScheduleDisable) if (!SmartScheduleInit ()) SmartScheduleDisable = TRUE; -#endif - OsInitAllocator(); - if (!OsDelayInitColors) OsInitColors(); } void OsCleanup(Bool terminating) { -#ifdef SERVER_LOCK if (terminating) { UnlockServer(); } -#endif } |