Index: apr.hw =================================================================== RCS file: /home/cvspublic/apr/include/apr.hw,v retrieving revision 1.84 diff -u -r1.84 apr.hw --- apr.hw 28 Jan 2002 19:35:25 -0000 1.84 +++ apr.hw 28 Jan 2002 21:41:21 -0000 @@ -92,6 +92,7 @@ #define NO_USE_SIGACTION +#ifndef _WIN32_WCE #define APR_HAVE_ARPA_INET_H 0 #define APR_HAVE_CONIO_H 1 #define APR_HAVE_CRYPT_H 0 @@ -121,6 +122,43 @@ #define APR_HAVE_SYS_UIO_H 0 #define APR_HAVE_SYS_WAIT_H 0 #define APR_HAVE_UNISTD_H 0 +#define APR_HAVE_STDDEF_H 1 +#define APR_HAVE_PROCESS_H 1 +#define APR_HAVE_TIME_H 1 +#else +#define APR_HAVE_ARPA_INET_H 0 +#define APR_HAVE_CONIO_H 1 +#define APR_HAVE_CRYPT_H 0 +#define APR_HAVE_CTYPE_H 0 +#define APR_HAVE_DIRENT_H 0 +#define APR_HAVE_ERRNO_H 0 +#define APR_HAVE_FCNTL_H 0 +#define APR_HAVE_IO_H 0 +#define APR_HAVE_LIMITS_H 0 +#define APR_HAVE_NETDB_H 0 +#define APR_HAVE_NETINET_IN_H 0 +#define APR_HAVE_NETINET_TCP_H 0 +#define APR_HAVE_PTHREAD_H 0 +#define APR_HAVE_SIGNAL_H 0 +#define APR_HAVE_STDARG_H 0 +#define APR_HAVE_STDINT_H 0 +#define APR_HAVE_STDIO_H 1 +#define APR_HAVE_STDLIB_H 1 +#define APR_HAVE_STRING_H 1 +#define APR_HAVE_STRINGS_H 0 +#define APR_HAVE_SYS_SENDFILE_H 0 +#define APR_HAVE_SYS_SIGNAL_H 0 +#define APR_HAVE_SYS_SOCKET_H 0 +#define APR_HAVE_SYS_SYSLIMITS_H 0 +#define APR_HAVE_SYS_TIME_H 0 +#define APR_HAVE_SYS_TYPES_H 0 +#define APR_HAVE_SYS_UIO_H 0 +#define APR_HAVE_SYS_WAIT_H 0 +#define APR_HAVE_UNISTD_H 0 +#define APR_HAVE_STDDEF_H 0 +#define APR_HAVE_PROCESS_H 0 +#define APR_HAVE_TIME_H 0 +#endif #define APR_USE_FLOCK_SERIALIZE 0 #define APR_USE_SYSVSEM_SERIALIZE 0 @@ -199,8 +237,12 @@ * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now */ #define SW_HIDE 0 +#ifndef _WIN32_WCE #include #include +#else +#include +#endif #endif /* !_WINDOWS_ */ #if APR_HAVE_STDLIB_H @@ -212,10 +254,15 @@ #if APR_HAVE_SYS_TYPES_H #include #endif - +#if APR_HAVE_STDDEF_H #include +#endif +#if APR_HAVE_TIME_H #include +#endif +#if APR_HAVE_PROCESS_H #include +#endif /* APR Feature Macros */ #define APR_HAS_SHARED_MEMORY 1 @@ -229,10 +276,15 @@ #define APR_HAS_DSO 1 #define APR_HAS_SO_ACCEPTFILTER 0 #define APR_HAS_UNICODE_FS 1 +#ifndef _WIN32_WCE #define APR_HAS_USER 1 #define APR_HAS_LARGE_FILES 1 #define APR_HAS_XTHREAD_FILES 1 - +#else +#define APR_HAS_USER 0 +#define APR_HAS_LARGE_FILES 0 +#define APR_HAS_XTHREAD_FILES 0 +#endif /* Not all platforms have a real INADDR_NONE. This macro replaces INADDR_NONE * on all platforms. */ @@ -256,7 +308,11 @@ typedef unsigned __int64 apr_uint64_t; typedef size_t apr_size_t; +#if APR_HAVE_STDDEF_H typedef ptrdiff_t apr_ssize_t; +#else +typedef int apr_ssize_t; +#endif typedef __int64 apr_off_t; typedef int apr_socklen_t; typedef int pid_t; /* Use this section to define all of the HAVE_FOO_H * that are required to build properly.