* config.h: Remove definitions for UNIX-specific permission

bits - they are now in fs.h.
* dirent_nt.c: Trim includes, disable code under MSVC.

pc/ChangeLog

@@ -1,5 +1,9 @@
 2002-01-21  Pavel Roskin  <proski@gnu.org>
 
+	* config.h: Remove definitions for UNIX-specific permission
+	bits - they are now in fs.h.
+	* dirent_nt.c: Trim includes, disable code under MSVC.
+
 	* chmod.c: Include ../src/global.h, remove unneeded includes.
 	* cons_nt.c: Likewise.
 	* drive.c: Likewise.

pc/config.h

@@ -100,15 +100,6 @@
 #define NO_INFOMOUNT
 
 typedef unsigned int umode_t;
-#define S_IFLNK 0
-#define S_ISLNK(x) 0
-
-#ifdef __EMX__
-
-#define S_IFBLK 0
-#define S_ISBLK(x) 0
-
-#endif /* __EMX__ */
 
 #ifdef __MINGW32__
 
@@ -134,13 +125,9 @@ typedef int pid_t;
 #define INLINE
 #define inline
 
-#define S_ISCHR(m)    (((m) & S_IFMT) == S_IFCHR)
 #define S_ISDIR(m)    (((m) & S_IFMT) == S_IFDIR)
 #define S_ISREG(m)    (((m) & S_IFMT) == S_IFREG)
 
-#define S_ISFIFO(m)   0
-#define S_ISBLK(x)    0
-
 #define S_IRWXU         0000700
 #define S_IRUSR         0000400
 #define S_IWUSR         0000200
@@ -201,10 +188,6 @@ typedef int pid_t;
 #define INLINE
 #define inline
 
-#define S_ISFIFO(m)   0
-#define S_ISBLK(x)    0
-
-#define S_ISCHR(m)    (((m) & S_IFCHR) != 0)
 #define S_ISDIR(m)    (((m) & S_IFDIR) != 0)
 #define S_ISREG(m)    (((m) & S_IFREG) != 0)
 

pc/dirent_nt.c

@@ -1,13 +1,13 @@
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
+
+/* glib provides a replacement for MSVC */
+#ifndef _MSC_VER
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <windows.h>
 #include <errno.h>
-#include "dirent.h"
+#include "../src/global.h"
 
 DIR *opendir (const char * a_dir)
 {
@@ -93,3 +93,4 @@ int closedir (DIR *dd_dir)
 	return 1;
 }
 
+#endif /* _MSC_VER */