[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Building X on OpenBSD 2.2



You wrote (in your message from Mon 4)
 > 
 > <somepath>/Xserver/servermd.h:  252 #error ARgj!

Yes, this was a change introduced late in the 2.2 release cycle that
broke the build of X11 on any platform except on the Mac.

The following patch should fix it (apply the patch at the top of your
linked tree, this should replace the link by the patched file).

Index: X11/xc/programs/Xserver/include/servermd.h
diff -u X11/xc/programs/Xserver/include/servermd.h:1.2 X11/xc/programs/Xserver/include/servermd.h:1.3
--- X11/xc/programs/Xserver/include/servermd.h:1.2	Mon Nov 17 17:49:22 1997
+++ X11/xc/programs/Xserver/include/servermd.h	Sat Dec 27 11:44:07 1997
@@ -239,7 +239,8 @@
 
 #endif /* tektronix */
 
-#if defined(macII) || ((defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__m68k__))
+#ifdef macII
+#if ((defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__m68k__))
 
 #define IMAGE_BYTE_ORDER      	MSBFirst        /* Values for the MacII only */
 #define BITMAP_BIT_ORDER      	MSBFirst
@@ -250,6 +251,7 @@
 
 #else
 #error ARgj!
+#endif /* m68k */
 #endif /* macII */
 
 #if (defined(mips) || defined(__mips)) && !defined(sgi)


					Matthieu