Index: config/cf/linux.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/linux.cf,v
retrieving revision 1.14
diff -u -r1.14 linux.cf
--- config/cf/linux.cf	15 Sep 2004 18:37:39 -0000	1.14
+++ config/cf/linux.cf	13 Oct 2004 08:29:41 -0000
@@ -332,7 +332,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
@@ -560,7 +560,7 @@
 
 #if UseElfFormat
 # ifndef DoLoadableServer
-#  if defined(HPArchitecture) || defined(MipsArchitecture) || defined(SuperHArchitecture)
+#  ifdef MipsArchitecture
 #   define DoLoadableServer	NO
 #  else
 #   define DoLoadableServer	YES
@@ -728,11 +728,7 @@
 
 #if UseElfFormat
 # ifndef DoLoadableServer
-#  ifdef HPArchitecture
-#   define DoLoadableServer	NO
-#  else
 #   define DoLoadableServer	YES
-#  endif
 # endif
 #endif
 
Index: programs/Xserver/os/hpsocket.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/os/hpsocket.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 hpsocket.c
--- programs/Xserver/os/hpsocket.c	14 Nov 2003 16:48:57 -0000	1.1.1.1
+++ programs/Xserver/os/hpsocket.c	13 Oct 2004 08:29:57 -0000
@@ -46,7 +46,7 @@
 
 	optval |= option;
 
-	setsockopt (socket_id, SOL_SOCKET, option, &optval, 1);
+	return setsockopt (socket_id, SOL_SOCKET, option, &optval, 1);
 }
 
 
@@ -62,5 +62,5 @@
 
 	optval &= ~option;
 
-	setsockopt (socket_id, SOL_SOCKET, option, &optval, 1);
+	return setsockopt (socket_id, SOL_SOCKET, option, &optval, 1);
 }