diff options
Diffstat (limited to 'os/osinit.c')
| -rw-r--r-- | os/osinit.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/os/osinit.c b/os/osinit.c index 2c4604b87..3a132faee 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -44,9 +44,7 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> -#endif #include <errno.h> #include <stdio.h> @@ -56,21 +54,22 @@ SOFTWARE. #ifdef HAVE_DLFCN_H #include <dlfcn.h> #endif -#ifdef HAVE_BACKTRACE +#if defined(HAVE_BACKTRACE) && defined(HAVE_EXECINFO_H) #include <execinfo.h> #endif +#include "dix/dix_priv.h" #include "os/busfault.h" #include "os/osdep.h" +#include "os/serverlock.h" #include "misc.h" #include "os.h" #include "opaque.h" -#include "misc.h" #include "dixstruct.h" #include "dixstruct_priv.h" -#if !defined(SYSV) && !defined(WIN32) +#if !defined(WIN32) #include <sys/resource.h> #endif @@ -205,7 +204,7 @@ OsInit(void) if (!server_poll) FatalError("failed to allocate poll structure"); -#ifdef HAVE_BACKTRACE +#if defined(HAVE_BACKTRACE) && defined(HAVE_EXECINFO_H) /* * initialize the backtracer, since the ctor calls dlopen(), which * calls malloc(), which isn't signal-safe. @@ -253,7 +252,7 @@ OsInit(void) dup2(fileno(err), 2); fclose(err); } -#if defined(SYSV) || defined(SVR4) || defined(WIN32) || defined(__CYGWIN__) +#if defined(SVR4) || defined(WIN32) || defined(__CYGWIN__) { static char buf[BUFSIZ]; |