Stage 1 in dissmantling _WIN_32_WCE ... cleanup header files

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895506 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 52 insertions, 72 deletions

diff --git a/include/apr.hw b/include/apr.hw
index 7cdfd1570..7cfb607db 100644
--- a/include/apr.hw
+++ b/include/apr.hw
@@ -123,23 +123,17 @@
 #define APR_HAS_INLINE          1
 #endif
 
-#ifdef _WIN32_WCE
-#define APR_NOT_IN_WCE          0
-#else
-#define APR_NOT_IN_WCE          1
-#endif
-
 #define APR_HAVE_ARPA_INET_H    0
-#define APR_HAVE_CONIO_H         APR_NOT_IN_WCE
+#define APR_HAVE_CONIO_H        1
 #define APR_HAVE_CRYPT_H        0
-#define APR_HAVE_CTYPE_H         APR_NOT_IN_WCE
+#define APR_HAVE_CTYPE_H        1
 #define APR_HAVE_DIRENT_H       0
-#define APR_HAVE_ERRNO_H         APR_NOT_IN_WCE
-#define APR_HAVE_FCNTL_H         APR_NOT_IN_WCE
+#define APR_HAVE_ERRNO_H        1
+#define APR_HAVE_FCNTL_H        1
 #define APR_HAVE_IFADDRS_H      0
-#define APR_HAVE_IO_H            APR_NOT_IN_WCE
-#define APR_HAVE_LIMITS_H        APR_NOT_IN_WCE
-#define APR_HAVE_MSWSOCK_H       APR_NOT_IN_WCE
+#define APR_HAVE_IO_H           1
+#define APR_HAVE_LIMITS_H       1
+#define APR_HAVE_MSWSOCK_H      1
 #define APR_HAVE_NETDB_H        0
 #define APR_HAVE_NETINET_IN_H   0
 #define APR_HAVE_NETINET_SCTP_H 0
@@ -148,13 +142,13 @@
 #define APR_HAVE_PROCESS_H      1
 #define APR_HAVE_PTHREAD_H      0
 #define APR_HAVE_SEMAPHORE_H    0
-#define APR_HAVE_SIGNAL_H        APR_NOT_IN_WCE
-#define APR_HAVE_STDARG_H        APR_NOT_IN_WCE
-#define APR_HAVE_STDDEF_H        APR_NOT_IN_WCE
+#define APR_HAVE_SIGNAL_H       1
+#define APR_HAVE_STDARG_H       1
+#define APR_HAVE_STDDEF_H       1
 #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_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_IOCTL_H    0
 #define APR_HAVE_SYS_SENDFILE_H 0
@@ -163,15 +157,15 @@
 #define APR_HAVE_SYS_SOCKIO_H   0
 #define APR_HAVE_SYS_SYSLIMITS_H 0
 #define APR_HAVE_SYS_TIME_H     0
-#define APR_HAVE_SYS_TYPES_H     APR_NOT_IN_WCE
+#define APR_HAVE_SYS_TYPES_H    1
 #define APR_HAVE_SYS_UIO_H      0
 #define APR_HAVE_SYS_UN_H       0
 #define APR_HAVE_SYS_WAIT_H     0
-#define APR_HAVE_TIME_H          APR_NOT_IN_WCE
+#define APR_HAVE_TIME_H         1
 #define APR_HAVE_UNISTD_H       0
-#define APR_HAVE_WINDOWS_H       1
-#define APR_HAVE_WINSOCK2_H      APR_NOT_IN_WCE
-#define APR_HAVE_WS2TCPIP_H      APR_NOT_IN_WCE
+#define APR_HAVE_WINDOWS_H      1
+#define APR_HAVE_WINSOCK2_H     1
+#define APR_HAVE_WS2TCPIP_H     1
 
 /** @} */
 /** @} */
@@ -317,9 +311,9 @@ extern "C" {
 #define APR_HAVE_SA_STORAGE     0
 #define APR_HAVE_STRCASECMP     0
 #define APR_HAVE_STRDUP         1
-#define APR_HAVE_STRICMP        APR_NOT_IN_WCE
+#define APR_HAVE_STRICMP        1
 #define APR_HAVE_STRNCASECMP    0
-#define APR_HAVE_STRNICMP       APR_NOT_IN_WCE
+#define APR_HAVE_STRNICMP       1
 #define APR_HAVE_STRSTR         1
 #define APR_HAVE_MEMCHR         1
 #define APR_HAVE_STRUCT_RLIMIT  0
@@ -330,7 +324,7 @@ extern "C" {
 /*  APR Feature Macros */
 #define APR_HAS_SHARED_MEMORY     1
 #define APR_HAS_THREADS           1
-#define APR_HAS_SENDFILE          APR_NOT_IN_WCE
+#define APR_HAS_SENDFILE          1
 #define APR_HAS_MMAP              1
 #define APR_HAS_FORK              0
 #define APR_HAS_RANDOM            1
@@ -339,12 +333,12 @@ extern "C" {
 #define APR_HAS_SO_ACCEPTFILTER   0
 #define APR_HAS_UNICODE_FS        1
 #define APR_HAS_PROC_INVOKED      1
-#define APR_HAS_USER              APR_NOT_IN_WCE
-#define APR_HAS_LARGE_FILES       APR_NOT_IN_WCE
-#define APR_HAS_XTHREAD_FILES     APR_NOT_IN_WCE
+#define APR_HAS_USER              1
+#define APR_HAS_LARGE_FILES       1
+#define APR_HAS_XTHREAD_FILES     1
 #define APR_HAS_OS_UUID           1
 
-#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD APR_NOT_IN_WCE
+#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 1
 
 /* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
  * to poll on files/pipes.
diff --git a/include/apr.hwc b/include/apr.hwc
index 016e1c0e4..6199deab3 100644
--- a/include/apr.hwc
+++ b/include/apr.hwc
@@ -123,23 +123,17 @@
 #define APR_HAS_INLINE          1
 #endif
 
-#ifdef _WIN32_WCE
-#define APR_NOT_IN_WCE          0
-#else
-#define APR_NOT_IN_WCE          1
-#endif
-
 #define APR_HAVE_ARPA_INET_H    0
-#define APR_HAVE_CONIO_H         APR_NOT_IN_WCE
+#define APR_HAVE_CONIO_H        1
 #define APR_HAVE_CRYPT_H        0
-#define APR_HAVE_CTYPE_H         APR_NOT_IN_WCE
+#define APR_HAVE_CTYPE_H        1
 #define APR_HAVE_DIRENT_H       0
-#define APR_HAVE_ERRNO_H         APR_NOT_IN_WCE
-#define APR_HAVE_FCNTL_H         APR_NOT_IN_WCE
+#define APR_HAVE_ERRNO_H        1
+#define APR_HAVE_FCNTL_H        1
 #define APR_HAVE_IFADDRS_H      0
-#define APR_HAVE_IO_H            APR_NOT_IN_WCE
-#define APR_HAVE_LIMITS_H        APR_NOT_IN_WCE
-#define APR_HAVE_MSWSOCK_H       APR_NOT_IN_WCE
+#define APR_HAVE_IO_H           1
+#define APR_HAVE_LIMITS_H       1
+#define APR_HAVE_MSWSOCK_H      1
 #define APR_HAVE_NETDB_H        0
 #define APR_HAVE_NETINET_IN_H   0
 #define APR_HAVE_NETINET_SCTP_H 0
@@ -148,13 +142,13 @@
 #define APR_HAVE_PROCESS_H      1
 #define APR_HAVE_PTHREAD_H      0
 #define APR_HAVE_SEMAPHORE_H    0
-#define APR_HAVE_SIGNAL_H        APR_NOT_IN_WCE
-#define APR_HAVE_STDARG_H        APR_NOT_IN_WCE
-#define APR_HAVE_STDDEF_H        APR_NOT_IN_WCE
+#define APR_HAVE_SIGNAL_H       1
+#define APR_HAVE_STDARG_H       1
+#define APR_HAVE_STDDEF_H       1
 #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_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_IOCTL_H    0
 #define APR_HAVE_SYS_SENDFILE_H 0
@@ -163,15 +157,15 @@
 #define APR_HAVE_SYS_SOCKIO_H   0
 #define APR_HAVE_SYS_SYSLIMITS_H 0
 #define APR_HAVE_SYS_TIME_H     0
-#define APR_HAVE_SYS_TYPES_H     APR_NOT_IN_WCE
+#define APR_HAVE_SYS_TYPES_H    1
 #define APR_HAVE_SYS_UIO_H      0
 #define APR_HAVE_SYS_UN_H       0
 #define APR_HAVE_SYS_WAIT_H     0
-#define APR_HAVE_TIME_H          APR_NOT_IN_WCE
+#define APR_HAVE_TIME_H         1
 #define APR_HAVE_UNISTD_H       0
-#define APR_HAVE_WINDOWS_H       1
-#define APR_HAVE_WINSOCK2_H      APR_NOT_IN_WCE
-#define APR_HAVE_WS2TCPIP_H      APR_NOT_IN_WCE
+#define APR_HAVE_WINDOWS_H      1
+#define APR_HAVE_WINSOCK2_H     1
+#define APR_HAVE_WS2TCPIP_H     1
 
 /** @} */
 /** @} */
@@ -317,9 +311,9 @@ extern "C" {
 #define APR_HAVE_SA_STORAGE     0
 #define APR_HAVE_STRCASECMP     0
 #define APR_HAVE_STRDUP         1
-#define APR_HAVE_STRICMP        APR_NOT_IN_WCE
+#define APR_HAVE_STRICMP        1
 #define APR_HAVE_STRNCASECMP    0
-#define APR_HAVE_STRNICMP       APR_NOT_IN_WCE
+#define APR_HAVE_STRNICMP       1
 #define APR_HAVE_STRSTR         1
 #define APR_HAVE_MEMCHR         1
 #define APR_HAVE_STRUCT_RLIMIT  0
@@ -330,7 +324,7 @@ extern "C" {
 /*  APR Feature Macros */
 #define APR_HAS_SHARED_MEMORY     1
 #define APR_HAS_THREADS           1
-#define APR_HAS_SENDFILE          APR_NOT_IN_WCE
+#define APR_HAS_SENDFILE          1
 #define APR_HAS_MMAP              1
 #define APR_HAS_FORK              0
 #define APR_HAS_RANDOM            1
@@ -339,12 +333,12 @@ extern "C" {
 #define APR_HAS_SO_ACCEPTFILTER   0
 #define APR_HAS_UNICODE_FS        1
 #define APR_HAS_PROC_INVOKED      1
-#define APR_HAS_USER              APR_NOT_IN_WCE
-#define APR_HAS_LARGE_FILES       APR_NOT_IN_WCE
-#define APR_HAS_XTHREAD_FILES     APR_NOT_IN_WCE
+#define APR_HAS_USER              1
+#define APR_HAS_LARGE_FILES       1
+#define APR_HAS_XTHREAD_FILES     1
 #define APR_HAS_OS_UUID           1
 
-#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD APR_NOT_IN_WCE
+#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 1
 
 /* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
  * to poll on files/pipes.
diff --git a/include/arch/win32/apr_private.h b/include/arch/win32/apr_private.h
index 381a27b4b..fcf877e36 100644
--- a/include/arch/win32/apr_private.h
+++ b/include/arch/win32/apr_private.h
@@ -41,7 +41,6 @@
  * Avoid dragging in wtypes.h unless it's absolutely necessary [generally
  * not with APR itself, until some GUI-related security is introduced.]
  */
-#ifndef _WIN32_WCE
 #define HAVE_ACLAPI 1
 #ifdef __wtypes_h__
 #include <accctrl.h>
@@ -50,18 +49,15 @@
 #include <accctrl.h>
 #undef __wtypes_h__
 #endif
-#else
-#define HAVE_ACLAPI 0
-#endif
 
 /* Use this section to define all of the HAVE_FOO_H
  * that are required to build properly.
  */
 #define HAVE_LIMITS_H 1
 #define HAVE_MALLOC_H 1
-#define HAVE_PROCESS_H APR_NOT_IN_WCE
+#define HAVE_PROCESS_H 1
 #define HAVE_SIGNAL_H 1
-#define HAVE_STDDEF_H APR_NOT_IN_WCE
+#define HAVE_STDDEF_H 1
 #define HAVE_STDLIB_H 1
 
 #define HAVE_STRICMP  1
@@ -150,12 +146,8 @@ APR_DECLARE_DATA int errno;
 #define APR_OFF_T_STRFN         apr_strtoi64
 #endif
 #else
-#if defined(_WIN32_WCE)
-#define APR_OFF_T_STRFN         strtol
-#else
 #define APR_OFF_T_STRFN         strtoi
 #endif
-#endif
 
 /* used to check for DWORD overflow in 64bit compiles */
 #define APR_DWORD_MAX 0xFFFFFFFFUL