trawick     2003/11/15 12:04:46

  Modified:    .        Tag: APACHE_2_0_BRANCH STATUS
               os/unix  Tag: APACHE_2_0_BRANCH unixd.c
  Log:
  backport a union semun portablity fix from 2.1-dev (use unsigned short
  instead of ushort)
  
  Reviewed by:	jwoolley, dreid
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.751.2.539 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.538
  retrieving revision 1.751.2.539
  diff -u -r1.751.2.538 -r1.751.2.539
  --- STATUS	13 Nov 2003 18:33:40 -0000	1.751.2.538
  +++ STATUS	15 Nov 2003 20:04:45 -0000	1.751.2.539
  @@ -317,10 +317,6 @@
           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
  
  
  
  No                   revision
  No                   revision
  1.55.2.4  +1 -1      httpd-2.0/os/unix/unixd.c
  
  Index: unixd.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/unix/unixd.c,v
  retrieving revision 1.55.2.3
  retrieving revision 1.55.2.4
  diff -u -r1.55.2.3 -r1.55.2.4
  --- unixd.c	16 Sep 2003 01:00:06 -0000	1.55.2.3
  +++ unixd.c	15 Nov 2003 20:04:46 -0000	1.55.2.4
  @@ -445,7 +445,7 @@
               union semun {
                   long val;
                   struct semid_ds *buf;
  -                ushort *array;
  +                unsigned short *array;
               };
   #endif
               union semun ick;