apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apr configure.in
Date Mon, 04 Dec 2000 23:42:10 GMT
wrowe       00/12/04 15:42:09

  Modified:    include  apr.hw apr.h.in apr_shmem.h
               .        configure.in
  Log:
    Win32 apr.hw back in line with apr.h.in, and reordered for consistency
    between these files.
  
  Revision  Changes    Path
  1.39      +53 -33    apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.hw,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- apr.hw	2000/12/04 04:10:47	1.38
  +++ apr.hw	2000/12/04 23:42:07	1.39
  @@ -113,26 +113,23 @@
   #define __attribute__(__x)
   #define ENUM_BITFIELD(e,n,w)  signed int n : w
   
  -#define APR_HAVE_ERRNO_H        1
  +#define NO_USE_SIGACTION
  +
  +#define APR_HAVE_CTYPE_H        1
   #define APR_HAVE_DIRENT_H       0
  +#define APR_HAVE_ERRNO_H        1
   #define APR_HAVE_FCNTL_H        0
   #define APR_HAVE_NETINET_IN_H   0
   #define APR_HAVE_PTHREAD_H      0
   #define APR_HAVE_STDARG_H       1
   #define APR_HAVE_STDIO_H        1
  +#define APR_HAVE_SYS_SOCKET_H   0
   #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_HAVE_SIGNAL_H       0
  +#define APR_HAVE_SYS_WAIT_H     0
  +#define APR_HAVE_UNISTD_H       0
   
  -#define APR_HAVE_MEMMOVE        1
  -#define APR_HAVE_STRCASECMP     0
  -#define APR_HAVE_STRICMP        1
  -#define APR_HAVE_STRNCASECMP    0
  -#define APR_HAVE_STRNICMP       1
  -#define APR_HAVE_STRDUP         1
  -#define APR_HAVE_STRSTR         1
  -
   #define APR_USE_FLOCK_SERIALIZE           0 
   #define APR_USE_SYSVSEM_SERIALIZE         0
   #define APR_USE_FCNTL_SERIALIZE           0
  @@ -141,28 +138,47 @@
   
   #define APR_PROCESS_LOCK_IS_GLOBAL        0
   
  -#define NO_USE_SIGACTION
  +#define APR_USES_ANONYMOUS_SHM            0
  +#define APR_USES_FILEBASED_SHM            0
  +#define APR_USES_KEYBASED_SHM             0
   
  +#define APR_FILE_BASED_SHM      0
  +#define APR_MEM_BASED_SHM       0
  +
  +#define APR_HAVE_IN_ADDR        1
  +#define APR_HAVE_INET_ADDR	1
  +#define APR_HAVE_INET_NETWORK   0
  +#define APR_HAVE_UNION_SEMUN    0
  +#define APR_HAVE_STRUCT_RLIMIT  0
  +#define APR_HAVE_SETRLIMIT      0
  +#define APR_HAVE_GETRLIMIT      0
  +#define APR_HAVE_STRICMP        1
  +#define APR_HAVE_STRNICMP       1
  +#define APR_HAVE_STRCASECMP     0
  +#define APR_HAVE_STRNCASECMP    0
  +#define APR_HAVE_STRDUP         1
  +#define APR_HAVE_STRSTR         1
  +#define APR_HAVE_MEMMOVE        1
  +#define APR_HAVE_BZERO          0
  +#define APR_HAVE_IPV6           0
  +
  +
   #if APR_HAVE_SYS_TYPES_H
   #include <sys/types.h>
   #endif
   
   /*  APR Feature Macros */
  -#define APR_HAS_THREADS        1
  -#define APR_HAS_SENDFILE       1
  -#define APR_HAS_RANDOM         1
  -#define APR_HAS_DSO            1
  -
  -#define APR_HAS_MMAP           0
  -#define APR_HAS_XLATE          0
  -
  -/*
  - * XXX: Problem - while this may be an NT build - so we are experimenting
  - * but if we have problems, please feel free to revert to 0.
  - */
  -#define APR_HAS_UNICODE_FS     1
  -
  -#define APR_HAS_USER           0
  +#define APR_HAS_SHARED_MEMORY     0
  +#define APR_HAS_THREADS           1
  +#define APR_HAS_SENDFILE          1
  +#define APR_HAS_MMAP              0
  +#define APR_HAS_FORK              0
  +#define APR_HAS_RANDOM            1
  +#define APR_HAS_XLATE             0
  +#define APR_HAS_OTHER_CHILD       0
  +#define APR_HAS_DSO               1
  +#define APR_HAS_UNICODE_FS        1
  +#define APR_HAS_USER              0
   
   /* Not all platforms have a real INADDR_NONE.  This macro replaces INADDR_NONE
    * on all platforms.
  @@ -189,13 +205,8 @@
   typedef  int         gid_t;
   
   /* Definitions that APR programs need to work properly. */
  -#define APR_SSIZE_T_FMT          "d"
  -#define APR_SIZE_T_FMT          "d"
  -#define APR_THREAD_FUNC          __stdcall
  -#define APR_OFF_T_FMT            "ld"
   
  -/* Local machine definition for console and log output. */
  -#define APR_EOL_STR              "\r\n"
  +#define APR_THREAD_FUNC          __stdcall
   
   /**
    * APR_DECLARE_EXPORT is defined when building the APR dynamic library,
  @@ -248,6 +259,15 @@
   #define APR_DECLARE_NONSTD(type)     __declspec(dllimport) type
   #define APR_DECLARE_DATA             __declspec(dllimport)
   #endif
  +
  +#define APR_SSIZE_T_FMT          "d"
  +
  +#define APR_SIZE_T_FMT          "d"
  +
  +#define APR_OFF_T_FMT            "ld"
  +
  +/* Local machine definition for console and log output. */
  +#define APR_EOL_STR              "\r\n"
   
   #define apr_signal(a,b) signal(a,b)
   
  
  
  
  1.54      +2 -4      apr/include/apr.h.in
  
  Index: apr.h.in
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.h.in,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- apr.h.in	2000/12/01 21:33:58	1.53
  +++ apr.h.in	2000/12/04 23:42:07	1.54
  @@ -25,8 +25,8 @@
   #endif
   
   #define APR_HAVE_CTYPE_H        @ctypeh@
  -#define APR_HAVE_ERRNO_H        @errnoh@
   #define APR_HAVE_DIRENT_H       @direnth@
  +#define APR_HAVE_ERRNO_H        @errnoh@
   #define APR_HAVE_FCNTL_H        @fcntlh@
   #define APR_HAVE_NETINET_IN_H   @netinet_inh@
   #define APR_HAVE_PTHREAD_H      @pthreadh@
  @@ -37,6 +37,7 @@
   #define APR_HAVE_SYS_UIO_H      @sys_uioh@
   #define APR_HAVE_SIGNAL_H       @signalh@
   #define APR_HAVE_SYS_WAIT_H     @sys_waith@
  +#define APR_HAVE_UNISTD_H       @unistdh@
   
   #define APR_USE_FLOCK_SERIALIZE           @flockser@ 
   #define APR_USE_SYSVSEM_SERIALIZE         @sysvser@
  @@ -216,9 +217,6 @@
   #ifdef WEXITSTATUS
   #define apr_wait_t       int
   #else
  -/* We don't have a POSIX wait interface. Assume we have the old-style. Is this
  - * a bad assumption? */
  -/* Yessiree bob, it was... but will this work instead? */
   #define apr_wait_t       union wait
   #define WEXITSTATUS(status)    (int)((status).w_retcode)
   #define WTERMSIG(status)       (int)((status).w_termsig)
  
  
  
  1.14      +6 -3      apr/include/apr_shmem.h
  
  Index: apr_shmem.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_shmem.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- apr_shmem.h	2000/11/26 03:00:03	1.13
  +++ apr_shmem.h	2000/12/04 23:42:07	1.14
  @@ -67,12 +67,15 @@
   extern "C" {
   #endif /* __cplusplus */
   
  -#if APR_USES_ANONYMOUS_SHM
  -typedef   void           apr_shm_name_t;
  -#elif APR_USES_FILEBASED_SHM
  +#if   APR_USES_FILEBASED_SHM
   typedef   char *         apr_shm_name_t;
   #elif APR_USES_KEYBASED_SHM
   typedef   key_t          apr_shm_name_t;
  +#else
  +/* If APR_USES_ANONYMOUS_SHM or any other case...
  + * we can't leave apr_shm_name_t entirely undefined.
  + */
  +typedef   void           apr_shm_name_t;
   #endif
   
   typedef   struct shmem_t apr_shmem_t;
  
  
  
  1.182     +1 -1      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.181
  retrieving revision 1.182
  diff -u -r1.181 -r1.182
  --- configure.in	2000/12/03 15:48:41	1.181
  +++ configure.in	2000/12/04 23:42:09	1.182
  @@ -285,7 +285,7 @@
   AC_CHECK_HEADERS(tpfeq.h)
   AC_CHECK_HEADERS(tpfio.h)
   AC_CHECK_HEADERS(sys/uio.h, sys_uioh="1", sys_uioh="0")
  -AC_CHECK_HEADERS(unistd.h)
  +AC_CHECK_HEADERS(unistd.h, unistdh="1", unistdh="0")
   AC_CHECK_HEADERS(poll.h)
   AC_CHECK_HEADERS(sys/poll.h)
   AC_CHECK_HEADERS(unix.h)
  
  
  

Mime
View raw message