Index: filestat.c
===================================================================
RCS file: /home/cvspublic/apr/file_io/win32/filestat.c,v
retrieving revision 1.60
diff -u -r1.60 filestat.c
--- filestat.c  28 Nov 2001 14:40:26 -0000  1.60
+++ filestat.c  28 Jan 2002 12:14:38 -0000
@@ -476,7 +476,8 @@
     }
 
 #if APR_HAS_UNICODE_FS
-    if (apr_os_level >= APR_WIN_NT) {
+    APR_OS_IS_UNICODE(apr_os_level)
+    {
         if (rv = utf8_to_unicode_path(wfname, sizeof(wfname) 
                                             / sizeof(apr_wchar_t), fname))
             return rv;
@@ -505,8 +506,9 @@
             filename = apr_pstrdup(cont, tmpname);
         }
     }
-    else
 #endif
+#if APR_HAS_ANSI_FS
+    APR_OS_SUPPORT_ANSI
       if ((apr_os_level >= APR_WIN_98) && (!(wanted & APR_FINFO_NAME) || isroot))
     {
         /* cannot use FindFile on a Win98 root, it returns \*
@@ -550,7 +552,7 @@
         FindClose(hFind);
         filename = apr_pstrdup(cont, FileInfo.n.cFileName);
     }
-
+#endif
     if (ident_rv != APR_INCOMPLETE) {
         if (fillin_fileinfo(finfo, (WIN32_FILE_ATTRIBUTE_DATA *) &FileInfo, 
                             0, wanted))
@@ -559,7 +561,8 @@
              * to reliably translate char devices to the path '\\.\device'
              * so go ask for the full path.
              */
-            if (apr_os_level >= APR_WIN_NT) {
+            APR_OS_IS_UNICODE(apr_os_level)
+            {
 #if APR_HAS_UNICODE_FS
                 apr_wchar_t tmpname[APR_FILE_MAX];
                 apr_wchar_t *tmpoff;