diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-08-16 12:55:40 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-08-16 12:55:40 +0000 |
| commit | cca1b1d7ca8d49ebe9e9fd60f8c4aea4c5d5c927 (patch) | |
| tree | c2ae13c3abf05582152617f562eb77673387432b /src/xrdb.c | |
| parent | ae13fc3c6fc733d859e3c9364f0c4337f75722bd (diff) | |
| download | emacs-cca1b1d7ca8d49ebe9e9fd60f8c4aea4c5d5c927.tar.gz | |
(SYSV): Don't define on Solaris 2.
From Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>.
Diffstat (limited to 'src/xrdb.c')
| -rw-r--r-- | src/xrdb.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index 632e447e851..e51a774dc47 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -33,12 +33,15 @@ Boston, MA 02111-1307, USA. */ #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 */ |