Index: apr.hw
===================================================================
RCS file: /home/cvspublic/apr/include/apr.hw,v
retrieving revision 1.82
diff -u -r1.82 apr.hw
--- apr.hw  10 Jan 2002 00:20:18 -0000  1.82
+++ apr.hw  28 Jan 2002 12:55:25 -0000
@@ -96,15 +96,14 @@
 #ifndef NOGDI
 #define NOGDI
 #endif
-#ifndef NONLS
-#define NONLS
-#endif
 #ifndef NOMCX
 #define NOMCX
 #endif
 #ifndef NOIME
 #define NOIME
 #endif
+
+#define APR_HAS_WINSOCK2    1
 #include <windows.h>
 /* 
  * Add a _very_few_ declarations missing from the restricted set of headers
@@ -112,16 +111,14 @@
  * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now
  */
 #define SW_HIDE             0
+#ifdef APR_HAS_WINSOCK2
 #include <winsock2.h>
 #include <mswsock.h>
+#else
+#include <winsock.h>
+#endif
 #endif /* !_WINDOWS_ */
 
-#include <sys/types.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <process.h>
-#include <stdlib.h>
 
 /* Done with badly written headers
  */
@@ -175,6 +172,9 @@
 #define APR_HAVE_SYS_UIO_H      0
 #define APR_HAVE_SYS_WAIT_H     0
 #define APR_HAVE_UNISTD_H       0
+#define APR_HAVE_TIME_H         1
+#define APR_HAVE_STDDEF_H       1
+#define APR_HAVE_PROCESS_H      1
 
 #define APR_USE_FLOCK_SERIALIZE           0 
 #define APR_USE_SYSVSEM_SERIALIZE         0
@@ -223,6 +223,17 @@
 #if APR_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#if APR_HAVE_TIME_H
+#include <stddef.h>
+#endif
+#include <stdio.h>
+#if APR_HAVE_TIME_H
+#include <time.h>
+#endif
+#if APR_HAVE_PROCESS_H
+#include <process.h>
+#endif
+#include <stdlib.h>
 
 /*  APR Feature Macros */
 #define APR_HAS_SHARED_MEMORY     1
@@ -236,9 +247,17 @@
 #define APR_HAS_DSO               1
 #define APR_HAS_SO_ACCEPTFILTER   0
 #define APR_HAS_UNICODE_FS        1
+#if defined(_WIN32_WCE) || defined(WINNT)
+#define APR_HAS_ANSI_FS           0
+#else
+#define APR_HAS_ANSI_FS           1
+#endif
 #define APR_HAS_USER              1
 #define APR_HAS_LARGE_FILES       1
 #define APR_HAS_XTHREAD_FILES     1
+#define APR_HAS_PIPES             1
+#define APR_HAS_STDIO             1
+
 
 /* Not all platforms have a real INADDR_NONE.  This macro replaces INADDR_NONE
  * on all platforms.
cvs server: Diffing arch
cvs server: Diffing arch/aix
cvs server: Diffing arch/beos
cvs server: Diffing arch/netware
cvs server: Diffing arch/os2
cvs server: Diffing arch/os390
cvs server: Diffing arch/unix
cvs server: Diffing arch/win32
Index: arch/win32/fileio.h
===================================================================
RCS file: /home/cvspublic/apr/include/arch/win32/fileio.h,v
retrieving revision 1.62
diff -u -r1.62 fileio.h
--- arch/win32/fileio.h 8 Jan 2002 22:48:25 -0000   1.62
+++ arch/win32/fileio.h 28 Jan 2002 12:55:26 -0000
@@ -225,9 +225,11 @@
             WIN32_FIND_DATAW *entry;
         } w;
 #endif
+#if APR_HAS_ANSI_FS
         struct {
             WIN32_FIND_DATAA *entry;
         } n;
+#endif        
     };
 };
 
Index: arch/win32/misc.h
===================================================================
RCS file: /home/cvspublic/apr/include/arch/win32/misc.h,v
retrieving revision 1.36
diff -u -r1.36 misc.h
--- arch/win32/misc.h   30 Dec 2001 20:54:38 -0000  1.36
+++ arch/win32/misc.h   28 Jan 2002 12:55:27 -0000
@@ -104,27 +104,28 @@
  * export new kernel or winsock functions or behavior.
  */
 typedef enum {
-        APR_WIN_UNK =       0,
-        APR_WIN_UNSUP =     1,
-        APR_WIN_95 =       10,
-        APR_WIN_95_B =     11,
-        APR_WIN_95_OSR2 =  12,
-        APR_WIN_98 =       14,
-        APR_WIN_98_SE =    16,
-        APR_WIN_ME =       18,
-        APR_WIN_NT =       30,
-        APR_WIN_NT_3_5 =   35,
-        APR_WIN_NT_3_51 =  36,
-        APR_WIN_NT_4 =     40,
-        APR_WIN_NT_4_SP2 = 42,
-        APR_WIN_NT_4_SP3 = 43,
-        APR_WIN_NT_4_SP4 = 44,
-        APR_WIN_NT_4_SP5 = 45,
-        APR_WIN_NT_4_SP6 = 46,
-        APR_WIN_2000 =     50,
-        APR_WIN_2000_SP1 = 51,
-        APR_WIN_2000_SP2 = 52,
-        APR_WIN_XP =       60
+        APR_WIN_UNK =      0x0000,
+        APR_WIN_UNSUP =    0x0010,
+        APR_WIN_CE_3 =     0x1001,
+        APR_WIN_95 =       0x2010,
+        APR_WIN_95_B =     0x2020,
+        APR_WIN_95_OSR2 =  0x2040,
+        APR_WIN_98 =       0x2100,
+        APR_WIN_98_SE =    0x2110,
+        APR_WIN_ME =       0x2200,
+        APR_WIN_NT =       0x4010,
+        APR_WIN_NT_3_5 =   0x4020,
+        APR_WIN_NT_3_51 =  0x4040,
+        APR_WIN_NT_4 =     0x4101,
+        APR_WIN_NT_4_SP2 = 0x4111,
+        APR_WIN_NT_4_SP3 = 0x4121,
+        APR_WIN_NT_4_SP4 = 0x4141,
+        APR_WIN_NT_4_SP5 = 0x4181,
+        APR_WIN_NT_4_SP6 = 0x4183,
+        APR_WIN_2000 =     0x4201,
+        APR_WIN_2000_SP1 = 0x4211,
+        APR_WIN_2000_SP2 = 0x4241,
+        APR_WIN_XP =       0x4401
 } apr_oslevel_e;
 
 extern apr_oslevel_e apr_os_level;
@@ -255,6 +256,15 @@
 #define GetSecurityInfo apr_winapi_GetSecurityInfo
 
 apr_status_t apr_get_oslevel(struct apr_pool_t *, apr_oslevel_e *);
+
+#if defined(_WIN32_WCE) || defined(WINNT)
+#define APR_OS_IS_UNICODE(os_level)
+#define APR_OS_SUPPORT_ANSI
+#else
+#define APR_OS_IS_UNICODE(os_level) if ((os_level) & 0x0001)
+#define APR_OS_SUPPORT_ANSI else
+#endif /* WINNT */
+
 #endif /* WIN32 */
 
 #endif  /* ! MISC_H */