import -ko -b 1.1.3 XEmacs XEmacs-21_2 r21-2-35

[chise/xemacs-chise.git.1] / src / sysdir.h

diff --git a/src/sysdir.h b/src/sysdir.h
index 76f9cd8..0139a8d 100644 (file)
--- a/src/sysdir.h
+++ b/src/sysdir.h
@@ -29,10 +29,11 @@ Boston, MA 02111-1307, USA.  */
 
 #ifdef SYSV_SYSTEM_DIR
 # include <dirent.h>
+#elif defined (WIN32_NATIVE)
+# include <direct.h>
+# include "ndir.h"
 #elif defined (NONSYSTEM_DIR_LIBRARY)
 # include "ndir.h"
-#elif defined (MSDOS)
-# include <dirent.h>
 #else
 # include <sys/dir.h>
 #endif /* not NONSYSTEM_DIR_LIBRARY */
@@ -58,11 +59,7 @@ Boston, MA 02111-1307, USA.  */
    Since applying strlen to the name always works, we'll just do that.  */
 #define NAMLEN(p) strlen (p->d_name)
 
-#ifdef MSDOS
-#define DIRENTRY_NONEMPTY(p) ((p)->d_name[0] != 0)
-#else
 #define DIRENTRY_NONEMPTY(p) ((p)->d_ino)
-#endif
 
 /* encapsulation: directory calls */