diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-07-23 13:25:37 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-07-23 13:37:42 -0400 |
| commit | 856db05b58b71c5ff22af727aba435a8c356abfa (patch) | |
| tree | 11901335f246f57a87b87a3ac13a0b59883464fb /os | |
| parent | ab6557fcd4bb4fd580bb1727dc8764f7dfb2cb30 (diff) | |
Unifdef sgi.
Diffstat (limited to 'os')
| -rw-r--r-- | os/access.c | 2 | ||||
| -rw-r--r-- | os/osdep.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/os/access.c b/os/access.c index c973cb114..6179d5bd1 100644 --- a/os/access.c +++ b/os/access.c @@ -290,7 +290,7 @@ AccessUsingXdmcp (void) } -#if ((defined(SVR4) && !defined(SCO325) && !defined(sun)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) +#if ( defined(SVR4) && !defined(SCO325) && !defined(sun) || defined(ISC)) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */ diff --git a/os/osdep.h b/os/osdep.h index 1b8dcf7ad..af1d5a9b4 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -58,7 +58,6 @@ SOFTWARE. #include <X11/Xdmcp.h> -#ifndef sgi /* SGI defines OPEN_MAX in a useless way */ #ifdef _POSIX_SOURCE #include <limits.h> #else @@ -66,7 +65,6 @@ SOFTWARE. #include <limits.h> #undef _POSIX_SOURCE #endif -#endif #ifndef OPEN_MAX #ifdef SVR4 |