--- OLD/xc/programs/Xserver/include/servermd.h	Thu Jan  1 00:00:00 1970
+++ NEW/xc/programs/Xserver/include/servermd.h	Thu Jan  1 00:00:00 1970
@@ -116,7 +116,17 @@
  *	Currently defined for SPARC.
  */
 
-#ifdef vax
+#if defined(__NeXT__)
+
+#define IMAGE_BYTE_ORDER		MSBFirst
+#define BITMAP_BIT_ORDER		MSBFirst
+#define GLYPHPADBYTES			4
+#define GETLEFTBITS_ALIGNMENT		1
+#define FAST_UNALIGNED_READS
+
+#endif /* NeXT */
+
+#if defined(vax) || defined(__vax__)
 
 #define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the VAX only */
 #define BITMAP_BIT_ORDER	LSBFirst
@@ -126,6 +136,15 @@
 
 #endif /* vax */
 
+#if defined(powerpc) || defined(__powerpc__)
+
+#define IMAGE_BYTE_ORDER	MSBFirst        /* Values for the VAX only */
+#define BITMAP_BIT_ORDER	MSBFirst
+#define GLYPHPADBYTES		4
+#define GETLEFTBITS_ALIGNMENT	4
+
+#endif /* powerpc */
+
 #if (defined(sun) && !(defined(i386) && defined(SVR4))) || \
     (defined(AMOEBA) && (defined(sparc) || defined(mc68000))) || \
     (defined(__uxp__) && (defined(sparc) || defined(mc68000))) || \
@@ -141,14 +160,14 @@
 # define BITMAP_BIT_ORDER	MSBFirst
 #endif
 
-#ifdef sparc
+#if defined(sparc) || defined(__sparc__)
 # define AVOID_MEMORY_READ
 # define LARGE_INSTRUCTION_CACHE
 # define FAST_CONSTANT_OFFSET_MODE
 # define SHARED_IDCACHE
 #endif
 
-#ifdef mc68020
+#if defined(mc68020) || defined(__mc68020__)
 #define FAST_UNALIGNED_READS
 #endif