# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 997966519 0
# Node ID 4fe55fd0a40832d1296584b186e6f38b76bbeaa0
# Parent  f61ce9f667a0e071dbc1bec0d762ede59254a25d
(SYSV): Don't define on Solaris 2.
From Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>.

diff -r f61ce9f667a0 -r 4fe55fd0a408 src/xrdb.c
--- 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 */