diff options
Diffstat (limited to 'xorg-server/os/osinit.c')
| -rwxr-xr-x[-rw-r--r--] | xorg-server/os/osinit.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c index 76e170ec5..6c66f9c12 100644..100755 --- a/xorg-server/os/osinit.c +++ b/xorg-server/os/osinit.c @@ -102,6 +102,7 @@ OsRegisterSigWrapper(OsSigWrapperPtr newSigWrapper) * OsSigHandler -- * Catch unexpected signals and exit or continue cleanly. */ +#if !defined(WIN32) || defined(__CYGWIN__) static void #ifdef SA_SIGINFO OsSigHandler(int signo, siginfo_t * sip, void *unused) @@ -146,6 +147,7 @@ OsSigHandler(int signo) FatalError("Caught signal %d (%s). Server aborting\n", signo, strsignal(signo)); } +#endif /* !WIN32 || __CYGWIN__ */ void OsInit(void) @@ -155,7 +157,7 @@ OsInit(void) char fname[PATH_MAX]; if (!been_here) { -#ifndef _MSC_VER +#if !defined(WIN32) || defined(__CYGWIN__) struct sigaction act, oact; int i; @@ -182,6 +184,8 @@ OsInit(void) siglist[i], strerror(errno)); } } +#endif /* !WIN32 || __CYGWIN__ */ + #ifdef HAVE_BACKTRACE /* * initialize the backtracer, since the ctor calls dlopen(), which @@ -203,7 +207,7 @@ OsInit(void) dlinfo(RTLD_SELF, RTLD_DI_SETSIGNAL, &failure_signal); #endif -#endif + #if !defined(__CYGWIN__) fclose(stdin); fclose(stdout); @@ -242,7 +246,7 @@ OsInit(void) #endif } -#ifndef _MSC_VER +#if !defined(WIN32) || defined(__CYGWIN__) if (getpgrp() == 0) setpgid(0, 0); #endif |