From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 1 Jun 2004 16:42:22 +0000 (+0000)
Subject:   HPUX11 must be tested before HPUX, since the former
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f266e4c42ced6eca584847100e444da95b293b38;p=thirdparty%2Fapache%2Fhttpd.git

  HPUX11 must be tested before HPUX, since the former
  is a superset of the other, and sane environments may
  define both.

  In the process, define HAVE_MMAP and USE_MMAP_FILES.
  Testing confirms this works fine.

  Drop the commented-out USE_MMAP_SCOREBOARD and
  HAVE_PTHREAD_SERIALIZED_ACCEPT defines, since they
  don't suggest the corresponding USE_SHMGET_SCOREBOARD
  and HAVE_FCNTL_SERIALIZED_ACCEPT must be commented out
  for the compiled httpd to behave as expected.  Also,
  the other platforms don't show alternatives, so this
  seemed inconsistent.

  In testing, USE_MMAP_SCOREBOARD works just fine, however
  USE_SHMGET_SCOREBOARD is preferred on linux where both
  are also supported, so I left the current default and
  followed the linux preference.

  Have not tested HAVE_PTHREAD_SERIALIZED_ACCEPT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@103812 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/include/ap_config.h b/src/include/ap_config.h
index 7fabc3be88e..cde5cccd96c 100644
--- a/src/include/ap_config.h
+++ b/src/include/ap_config.h
@@ -189,6 +189,21 @@ int gethostname(char *name, int namelen);
 #define SELECT_NEEDS_CAST
 #define HAVE_SYSLOG 1
 
+#elif defined(HPUX11)
+#ifndef _HPUX_SOURCE
+#define _HPUX_SOURCE
+#endif
+#define HAVE_SHMGET
+#define USE_SHMGET_SCOREBOARD
+#undef  HAVE_GMTOFF
+#define HAVE_FCNTL_SERIALIZED_ACCEPT
+#define HAVE_MMAP
+#define USE_MMAP_FILES
+#define NO_KILLPG
+#undef  NO_SETSID
+#define HAVE_SYSLOG
+#define AP_ENABLE_EXCEPTION_HOOK
+
 #elif defined(HPUX) || defined(HPUX10)
 #undef HAVE_GMTOFF
 #define NO_KILLPG
@@ -205,24 +220,6 @@ int gethostname(char *name, int namelen);
 typedef int rlim_t;
 #endif
 
-#elif defined(HPUX11)
-#ifndef _HPUX_SOURCE
-#define _HPUX_SOURCE
-#endif
-#define HAVE_SHMGET
-#define USE_SHMGET_SCOREBOARD
-#undef  HAVE_GMTOFF
-#define HAVE_FCNTL_SERIALIZED_ACCEPT
-/* feeling brave?  want to try using POSIX mutexes? */
-/* #define HAVE_MMAP */
-/* #define USE_MMAP_SCOREBOARD */
-/* #define USE_MMAP_FILES */
-/* #define HAVE_PTHREAD_SERIALIZED_ACCEPT */
-#define NO_KILLPG
-#undef  NO_SETSID
-#define HAVE_SYSLOG
-#define AP_ENABLE_EXCEPTION_HOOK
-
 #elif defined(AIX)
 #undef HAVE_GMTOFF
 #undef NO_KILLPG