Index: misc.h
===================================================================
RCS file: /home/cvspublic/apr/include/arch/win32/misc.h,v
retrieving revision 1.36
diff -u -r1.36 misc.h
--- misc.h  30 Dec 2001 20:54:38 -0000  1.36
+++ misc.h  28 Jan 2002 12:18:12 -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 */