X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fsysdir.h;h=a123909d47b17adb559cc7c0698c6c76780aeca9;hb=c17cfefd00f49430bd139e11bfc580734091d728;hp=76f9cd8688d9deb5ff39ccfbfc40e0101667e589;hpb=3e447015251ce6dcde843cbed10d9033d5538622;p=chise%2Fxemacs-chise.git.1

diff --git a/src/sysdir.h b/src/sysdir.h
index 76f9cd86..a123909 100644
--- 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,10 +59,10 @@ 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)
+#ifdef __CYGWIN__
+# define DIRENTRY_NONEMPTY(p) ((p)->d_name[0] != '\0')
 #else
-#define DIRENTRY_NONEMPTY(p) ((p)->d_ino)
+# define DIRENTRY_NONEMPTY(p) ((p)->d_ino)
 #endif
 
 /* encapsulation: directory calls */