Stage 2 in dissmantling _WIN_32_WCE ... cleanup private header files

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

4 files changed, 2 insertions, 18 deletions

diff --git a/include/arch/win32/apr_arch_misc.h b/include/arch/win32/apr_arch_misc.h
index fbaceae06..fe42ec49b 100644
--- a/include/arch/win32/apr_arch_misc.h
+++ b/include/arch/win32/apr_arch_misc.h
@@ -43,9 +43,7 @@
 #if APR_HAVE_STRING_H
 #include <string.h>
 #endif
-#ifndef _WIN32_WCE
 #include <tlhelp32.h>
-#endif
 
 #if defined(HAVE_IF_INDEXTONAME) && defined(_MSC_VER)
 #include <Iphlpapi.h>
@@ -144,7 +142,7 @@ apr_status_t apr_get_oslevel(apr_oslevel_e *);
 #define ELSE_WIN_OS_IS_ANSI
 #endif /* APR_HAS_ANSI_FS && APR_HAS_UNICODE_FS */
 
-#if defined(_MSC_VER) && !defined(_WIN32_WCE)
+#if defined(_MSC_VER)
 #include "crtdbg.h"
 
 static APR_INLINE void* apr_malloc_dbg(size_t size, const char* filename,
@@ -237,7 +235,6 @@ FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal);
  * In the case of non-text functions, simply #define the original name
  */
 
-#if !defined(_WIN32_WCE)
 /* This group is NOT available to all versions of WinNT,
  * these we must always look up
  */
@@ -316,6 +313,4 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_API_MS_WIN_DOWNLEVEL_SHELL32_L1_1_0, LPWSTR *,
                           (LPCWSTR lpCmdLine, int *pNumArgs),
                           (lpCmdLine, pNumArgs));
 
-#endif /* !defined(_WIN32_WCE) */
-
 #endif  /* ! MISC_H */
diff --git a/include/arch/win32/apr_arch_networkio.h b/include/arch/win32/apr_arch_networkio.h
index 04be55595..a2d0879c1 100644
--- a/include/arch/win32/apr_arch_networkio.h
+++ b/include/arch/win32/apr_arch_networkio.h
@@ -56,18 +56,9 @@ struct apr_socket_t {
     apr_pollset_t *pollset;
 };
 
-#ifdef _WIN32_WCE
-#ifndef WSABUF
-typedef struct _WSABUF {
-    u_long      len;     /* the length of the buffer */
-    char FAR *  buf;     /* the pointer to the buffer */
-} WSABUF, FAR * LPWSABUF;
-#endif
-#else
 #ifdef _MSC_VER
 #define HAVE_STRUCT_IPMREQ
 #endif
-#endif
 
 apr_status_t status_from_res_error(int);
 
diff --git a/include/arch/win32/apr_arch_threadproc.h b/include/arch/win32/apr_arch_threadproc.h
index 76a3c01e4..13568256e 100644
--- a/include/arch/win32/apr_arch_threadproc.h
+++ b/include/arch/win32/apr_arch_threadproc.h
@@ -58,11 +58,9 @@ struct apr_procattr_t {
     apr_int32_t detached;
     apr_child_errfn_t *errfn;
     apr_int32_t errchk;
-#ifndef _WIN32_WCE
     HANDLE     user_token;
     LPSECURITY_ATTRIBUTES   sa;
     LPVOID                  sd;
-#endif
 };
 
 struct apr_thread_once_t {
diff --git a/include/arch/win32/apr_private.h b/include/arch/win32/apr_private.h
index fcf877e36..c023d27bc 100644
--- a/include/arch/win32/apr_private.h
+++ b/include/arch/win32/apr_private.h
@@ -135,7 +135,7 @@ APR_DECLARE_DATA int errno;
 #endif
 
 /* MSVC 7.0 introduced _strtoi64 */
-#if _MSC_VER >= 1300 && _INTEGRAL_MAX_BITS >= 64 && !defined(_WIN32_WCE)
+#if _MSC_VER >= 1300 && _INTEGRAL_MAX_BITS >= 64
 #define APR_INT64_STRFN	      _strtoi64
 #endif