From cca1b1d7ca8d49ebe9e9fd60f8c4aea4c5d5c927 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 16 Aug 2001 12:55:40 +0000 Subject: [PATCH] (SYSV): Don't define on Solaris 2. From Rainer Orth . --- src/ChangeLog | 3 +++ src/xrdb.c | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ed0ecf7fd26..733bde62594 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2001-08-16 Gerd Moellmann + * xrdb.c (SYSV): Don't define on Solaris 2. + From Rainer Orth . + * xdisp.c (move_it_by_lines) : Start at the beginning of the screen line, not text line, containing IT's current position. 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 #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 */ -- 2.39.5