httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/os/win32 os.h
Date Wed, 17 May 2000 01:52:49 GMT
wrowe       00/05/16 18:52:49

  Modified:    src/include ap_config.h
               src/lib/apr/include apr.hw
               src/main util.c
               src/os/win32 os.h
  Log:
  
    Cleanup ap_config.h fallout for Win32.  Only a few very minor
    changes to ap_config.h and util.c, but they might hurt someone...
    please watch those two carefully.
  
  
  Revision  Changes    Path
  1.24      +6 -7      apache-2.0/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ap_config.h	2000/05/17 00:22:56	1.23
  +++ ap_config.h	2000/05/17 01:52:46	1.24
  @@ -62,7 +62,6 @@
   #include "ap_mmn.h"		/* MODULE_MAGIC_NUMBER_ */
   
   #ifdef WIN32
  -#include "ap_config_win32.h"
   #include "../os/win32/os.h"
   #else
   #include "ap_config_auto.h"
  @@ -121,17 +120,17 @@
   
   /* We have a POSIX wait interface */
   #include <sys/wait.h>
  -#define ap_wait_t       int
  -
  -#else /* HAVE_SYS_WAIT_H */
   
  +#ifdef WEXITSTATUS
  +#define ap_wait_t       int
  +#else
   /* We don't have a POSIX wait interface. Assume we have the old-style. Is this
    * a bad assumption? */
  -#include <sys/wait.h>
  +/* Yessiree bob, it was... but will this work instead? */
   #define ap_wait_t       union wait
   #define WEXITSTATUS(status)	(int)((status).w_retcode)
   #define WTERMSIG(status)	(int)((status).w_termsig)
  -
  +#endif /* !WEXITSTATUS */
   #endif /* HAVE_SYS_WAIT_H */
   
   /* ap_ versions of ctype macros to make sure they deal with 8-bit chars */
  @@ -178,7 +177,7 @@
   #endif
   
   /* EAGAIN apparently isn't defined on some systems */
  -#ifndef HAVE_EAGAIN
  +#if !defined(HAVE_EAGAIN) && !defined(EAGAIN)
   #define EAGAIN EWOULDBLOCK
   #endif
   
  
  
  
  1.9       +2 -0      apache-2.0/src/lib/apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.hw,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- apr.hw	2000/05/01 14:39:32	1.8
  +++ apr.hw	2000/05/17 01:52:47	1.9
  @@ -124,6 +124,8 @@
   #define APR_HAVE_SYS_TYPES_H    1
   #define APR_HAVE_SYS_UIO_H      0
   #define APR_HAVE_IN_ADDR        1
  +#define APR_HAVE_INET_ADDR	1
  +
   
   #define APR_USE_FLOCK_SERIALIZE           0 
   #define APR_USE_SYSVSEM_SERIALIZE         0
  
  
  
  1.44      +2 -2      apache-2.0/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- util.c	2000/05/16 01:43:46	1.43
  +++ util.c	2000/05/17 01:52:48	1.44
  @@ -1771,7 +1771,7 @@
   #ifndef HAVE_INITGROUPS
   int initgroups(const char *name, gid_t basegid)
   {
  -#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) || defined(TPF)
|| defined(__TANDEM) || defined(OS2)
  +#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) || defined(TPF)
|| defined(__TANDEM) || defined(OS2) || defined(WIN32)
   /* QNX, MPE and BeOS do not appear to support supplementary groups. */
       return 0;
   #else /* ndef QNX */
  @@ -1799,7 +1799,7 @@
   }
   #endif /* def NEED_INITGROUPS */
   
  -#ifndef HAVE_WAITPID
  +#if !defined(HAVE_WAITPID) && !defined(WIN32)
   /* From ikluft@amdahl.com
    * this is not ideal but it works for SVR3 variants
    * Modified by dwd@bell-labs.com to call wait3 instead of wait because
  
  
  
  1.28      +6 -1      apache-2.0/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- os.h	2000/05/17 00:45:05	1.27
  +++ os.h	2000/05/17 01:52:48	1.28
  @@ -136,12 +136,17 @@
   
   #define MODULE_VAR_EXPORT   __declspec(dllexport)
   
  -
  +#define HAVE_MEMMOVE
   #define HAVE_STRCASECMP
   #define HAVE_STRNCASECMP
  +#define HAVE_STRERROR
  +#define HAVE_STRDUP
  +#define HAVE_STRSTR
   
   #define strcasecmp(s1, s2) stricmp(s1, s2)
   #define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
  +
  +#define HAVE_SYS_STAT_H
   #define lstat(x, y) stat(x, y)
   #define S_ISLNK(m) (0)
   #define S_ISREG(m) ((m & _S_IFREG) == _S_IFREG)
  
  
  

Mime
View raw message