diff options
Diffstat (limited to 'os')
| -rw-r--r-- | os/access.c | 4 | ||||
| -rw-r--r-- | os/log.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/os/access.c b/os/access.c index 9ac66c179..2d41f33e9 100644 --- a/os/access.c +++ b/os/access.c @@ -1,5 +1,5 @@ /* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.3 2004/06/25 08:58:18 ago Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -305,7 +305,7 @@ AccessUsingXdmcp (void) } -#if ((defined(SVR4) && !defined(DGUX) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) +#if ((defined(SVR4) && !defined(DGUX) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */ @@ -385,10 +385,10 @@ LogMessage(MessageType type, const char *format, ...) } #ifdef __GNUC__ -static void AbortServer(void) __attribute__((noreturn)); +void AbortServer(void) __attribute__((noreturn)); #endif -static void +void AbortServer(void) { OsCleanup(TRUE); |