Index: shm.c
===================================================================
RCS file: /home/cvspublic/apr/shmem/win32/shm.c,v
retrieving revision 1.8
diff -u -r1.8 shm.c
--- shm.c   25 Jan 2002 07:16:01 -0000  1.8
+++ shm.c   28 Jan 2002 12:21:20 -0000
@@ -144,15 +144,17 @@
     }
 
 #if APR_HAS_UNICODE_FS
-    if (apr_os_level >= APR_WIN_NT) 
+    APR_OS_IS_UNICODE(apr_os_level) 
     {
         hMap = CreateFileMappingW(hFile, psec, PAGE_READWRITE, 0, size, mapkey);
     }
-    else
 #endif
+#if APR_HAS_ANSI_FS
+    APR_OS_SUPPORT_ANSI
     {
         hMap = CreateFileMappingA(hFile, psec, PAGE_READWRITE, 0, size, mapkey);
     }
+#endif
     err = apr_get_os_error();
 
     if (file) {
@@ -214,15 +216,17 @@
     }
 
 #if APR_HAS_UNICODE_FS
-    if (apr_os_level >= APR_WIN_NT) 
+    APR_OS_IS_UNICODE(apr_os_level) 
     {
         hMap = OpenFileMappingW(FILE_MAP_READ | FILE_MAP_WRITE, FALSE, mapkey);
     }
-    else
 #endif
+#if APR_HAS_ANSI_FS
+    APR_OS_SUPPORT_ANSI
     {
         hMap = OpenFileMappingA(FILE_MAP_READ | FILE_MAP_WRITE, FALSE, mapkey);
     }
+#endif
 
     if (!hMap) {
         return apr_get_os_error();