Mercurial > emacs
changeset 38840:4fe55fd0a408
(SYSV): Don't define on Solaris 2.
From Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 16 Aug 2001 12:55:19 +0000 |
| parents | f61ce9f667a0 |
| children | f48cce6677e7 |
| files | src/xrdb.c |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xrdb.c Thu Aug 16 11:48:56 2001 +0000 +++ b/src/xrdb.c Thu Aug 16 12:55:19 2001 +0000 @@ -33,12 +33,15 @@ #include <stdio.h> #if 1 /* I'd really appreciate it if this code could go away... -JimB */ -/* this avoids lossage in the `dual-universe' headers on AT&T SysV X11 */ -#ifdef USG5 +/* This avoids lossage in the `dual-universe' headers on AT&T SysV + X11. Don't do it on Solaris, because it breaks compilation with + XFree86 4.0.3 (and probably many other X11R6 releases) on Solaris + 2 */ +#if defined(USG5) && !defined(SOLARIS2) #ifndef SYSV #define SYSV #endif -#endif /* USG5 */ +#endif /* USG5 && !SOLARIS2 */ #endif /* 1 */