(SYSV): Don't define on Solaris 2.

From Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>.

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  <gerd@gnu.org>
 
+        * xrdb.c (SYSV): Don't define on Solaris 2.
+        From Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>.
+
         * xdisp.c (move_it_by_lines) <DVPOS < 0>: 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 <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 */