[_WIN32] (S_IRUSR, S_IWUSR, S_IXUSR, S_IRWXU, S_IRGRP, S_IWGRP)

(S_IXGRP, S_IRWXG, S_IROTH, S_IWOTH, S_IXOTH, S_IRWXO): Move from
include/misc.h to new src/lib/w32/unistd.h.

diff --git a/include/misc.h b/include/misc.h
index 0e5ede0b8b6154f108404e9c3202f6adf31c5ed6..455eb7965e7bb3c66e77a86080f78c938ad04d5b 100644 (file)
--- a/include/misc.h
+++ b/include/misc.h
@@ -56,24 +56,6 @@ typedef int pid_t;
 
 #define random rand
 #define srandom srand
-#ifndef S_IRUSR
-#define S_IRUSR            _S_IREAD
-#define S_IWUSR            _S_IWRITE
-#define S_IXUSR            _S_IEXEC
-#define S_IRWXU            S_IRUSR | S_IWUSR | S_IXUSR
-#endif
-#ifndef S_IRGRP
-#define S_IRGRP            0
-#define S_IWGRP            0
-#define S_IXGRP            0
-#define S_IRWXG            S_IRGRP | S_IWGRP | S_IXGRP
-#endif
-#ifndef S_IROTH
-#define S_IROTH            0
-#define S_IWOTH            0
-#define S_IXOTH            0
-#define S_IRWXO            S_IROTH | S_IWOTH | S_IXOTH
-#endif
 #endif /* _WIN32 */
 
 #ifndef S_IRWUG

diff --git a/src/lib/w32/unistd.h b/src/lib/w32/unistd.h
index fd024a0e792637f23b7b90f349879320a8c22bc7..43c8a8d5cda0302bdeca6fe57d3ab66b7639997f 100644 (file)
--- a/src/lib/w32/unistd.h
+++ b/src/lib/w32/unistd.h
@@ -48,6 +48,24 @@ extern int posix_mkdir(const char *dirname, int perm);
 /*
  * posixio.c
  */
+#ifndef S_IRUSR
+#define S_IRUSR            _S_IREAD
+#define S_IWUSR            _S_IWRITE
+#define S_IXUSR            _S_IEXEC
+#define S_IRWXU            S_IRUSR | S_IWUSR | S_IXUSR
+#endif
+#ifndef S_IRGRP
+#define S_IRGRP            0
+#define S_IWGRP            0
+#define S_IXGRP            0
+#define S_IRWXG            S_IRGRP | S_IWGRP | S_IXGRP
+#endif
+#ifndef S_IROTH
+#define S_IROTH            0
+#define S_IWOTH            0
+#define S_IXOTH            0
+#define S_IRWXO            S_IROTH | S_IWOTH | S_IXOTH
+#endif
 
 typedef int socklen_t;