backport a union semun portablity fix from 2.1-dev (use unsigned short

instead of ushort)

Reviewed by:	jwoolley, dreid

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

diff --git a/STATUS b/STATUS
index 3c32a94719b8c61eacd97210bc5658a450ad5405..dda41e3f9d94a7cc5fd6ae7ad59b46a0ae429439 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/11/13 18:33:40 $]
+Last modified at [$Date: 2003/11/15 20:04:45 $]
 
 Release:
 
@@ -317,10 +317,6 @@ PATCHES TO BACKPORT FROM 2.1
         modules/http/http_protocol.c: r1.469
       +1: trawick
 
-    * os/unix/unixd.c portability issue (ushort vs. unsigned short)
-        os/unix/unixd.c: r1.61
-      +1: trawick
-
     * LDAP cache fixes from Matthieu Estrade; see PR 18756
         include/util_ldap.h r1.12
         modules/experimental/util_ldap.c r1.15, r1.16

diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index d5b6c90b8e92e0a83dbadf6bd14f9462a3a5c40f..e6b375a06decd6f466092f54ffca6225a7598145 100644 (file)
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -445,7 +445,7 @@ AP_DECLARE(apr_status_t) unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex)
             union semun {
                 long val;
                 struct semid_ds *buf;
-                ushort *array;
+                unsigned short *array;
             };
 #endif
             union semun ick;