diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-06-15 19:00:43 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-06-16 08:21:52 -0700 |
| commit | 38f9054554d63525d2dd51aafb5eb57821158ab9 (patch) | |
| tree | dad20d91f096822abed8ffa80b7c5ea7dcffe84e | |
| parent | 7bfe1323f16a1a69cc474659f7ac0c2570b1cf42 (diff) | |
Drop ancient USG SysV #ifdefs
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | include/X11/Xlib.h | 13 | ||||
| -rw-r--r-- | src/XlibInt.c | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h index 4869446a..682988cf 100644 --- a/include/X11/Xlib.h +++ b/include/X11/Xlib.h @@ -38,20 +38,7 @@ in this Software without prior written authorization from The Open Group. #define XlibSpecificationRelease 6 -#ifdef USG -#ifndef __TYPES__ -#include <sys/types.h> /* forgot to protect it... */ -#define __TYPES__ -#endif /* __TYPES__ */ -#else -#if defined(_POSIX_SOURCE) && defined(MOTOROLA) -#undef _POSIX_SOURCE -#include <sys/types.h> -#define _POSIX_SOURCE -#else #include <sys/types.h> -#endif -#endif /* USG */ #if defined(__SCO__) || defined(__UNIXWARE__) #include <stdint.h> diff --git a/src/XlibInt.c b/src/XlibInt.c index ad91400d..320e8080 100644 --- a/src/XlibInt.c +++ b/src/XlibInt.c @@ -3231,7 +3231,7 @@ void _XData32( * and so, you may be better off using gethostname (if it exists). */ -#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) +#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(SVR4) #define NEED_UTSNAME #include <sys/utsname.h> #endif |