From: Jeff Trawick <trawick@apache.org>
Date: Fri, 20 Sep 2002 10:13:57 +0000 (+0000)
Subject: Fix a problem with the definition of union semun which broke
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41e94b4af30e5cf7adb43138eedc2acb97915469;p=thirdparty%2Fapache%2Fhttpd.git

Fix a problem with the definition of union semun which broke
System V semaphores on systems where sizeof(int) != sizeof(long).

PR:               12072
Submitted by:	  <winterling@de.ibm.com>
Reviewed by:	  Jeff Trawick, Justin Erenkrantz


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

diff --git a/src/CHANGES b/src/CHANGES
index d15bb6078e2..ca4271abf09 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 1.3.27
 
+  *) Fix a problem with the definition of union semun which broke
+     System V semaphores on systems where sizeof(int) != sizeof(long).
+     PR 12072  [<winterling@de.ibm.com>]
+
   *) The protocol version (eg: HTTP/1.1) in the request line parsing
      is now case insensitive. This closes a few PRs and implies that
      ProtocolReqCheck will trigger on *true* invalid protocols.
diff --git a/src/main/http_main.c b/src/main/http_main.c
index db3e04b898d..0c9333d89d9 100644
--- a/src/main/http_main.c
+++ b/src/main/http_main.c
@@ -749,9 +749,8 @@ accept_mutex_methods_s accept_mutex_pthread_s = {
 #include <sys/sem.h>
 
 #ifdef NEED_UNION_SEMUN
-/* it makes no sense, but this isn't defined on solaris */
 union semun {
-    long val;
+    int val;
     struct semid_ds *buf;
     ushort *array;
 };