--- programs/Xserver/include/servermd.h	2004/05/19 09:05:55	1.1
+++ programs/Xserver/include/servermd.h	2004/05/19 09:07:40
@@ -153,7 +153,7 @@
 
 #endif /* __arm32__ */
 
-#if defined (hpux)
+#if defined (hpux) || defined (__hppa)
 
 #define IMAGE_BYTE_ORDER	MSBFirst
 #define BITMAP_BIT_ORDER	MSBFirst
--- config/cf/linux.cf	2004/05/27 13:47:15	1.1
+++ config/cf/linux.cf	2004/05/27 13:47:21
@@ -314,7 +314,7 @@
 #  elif defined(Arm32Architecture)
 #    define BuildXF86DRI	NO
 #  elif defined(HPArchitecture)
-#    define BuildXF86DRI	NO
+#    define BuildXF86DRI	YES
 #  elif defined(i386Architecture)
 #    if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
 #      define BuildXF86DRI	YES
@@ -537,7 +537,7 @@
 #if UseElfFormat
 # ifndef DoLoadableServer
 #  if defined(HPArchitecture) || defined(SuperHArchitecture)
-#   define DoLoadableServer	NO
+#   define DoLoadableServer	YES
 #  else
 #   define DoLoadableServer	YES
 #  endif
@@ -705,7 +705,7 @@
 #if UseElfFormat
 # ifndef DoLoadableServer
 #  ifdef HPArchitecture
-#   define DoLoadableServer	NO
+#   define DoLoadableServer	YES
 #  else
 #   define DoLoadableServer	YES
 #  endif
--- programs/Xserver/os/hpsocket.c	2004/06/07 05:32:44	1.1
+++ programs/Xserver/os/hpsocket.c	2004/06/07 05:33:00
@@ -47,6 +47,7 @@
 	optval |= option;
 
 	setsockopt (socket_id, SOL_SOCKET, option, &optval, 1);
+        return 0;
 }
 
 
@@ -63,4 +64,5 @@
 	optval &= ~option;
 
 	setsockopt (socket_id, SOL_SOCKET, option, &optval, 1);
+        return 0;
 }