fcntl.h should make availabel the mode constants from sys/stat.h

also remove some legacy nonsense that crept in.

diff --git a/include/fcntl.h b/include/fcntl.h
index 61a6cb556e5b0afbccf7fad5c41b26dd2a693040..016653cfc30822f9226508da3b21e846a39aef88 100644 (file)
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -36,6 +36,24 @@ int posix_fallocate(int, off_t, off_t);
 #define SEEK_CUR 1
 #define SEEK_END 2
 
+#ifndef S_IRUSR
+#define S_ISUID 04000
+#define S_ISGID 02000
+#define S_ISVTX 01000
+#define S_IRUSR 0400
+#define S_IWUSR 0200
+#define S_IXUSR 0100
+#define S_IRWXU 0700
+#define S_IRGRP 0040
+#define S_IWGRP 0020
+#define S_IXGRP 0010
+#define S_IRWXG 0070
+#define S_IROTH 0004
+#define S_IWOTH 0002
+#define S_IXOTH 0001
+#define S_IRWXO 0007
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/sys/stat.h b/include/sys/stat.h
index 5363a9a3d89b93f765636bd74072e5a80bb1143a..2eb6fb0c11615d2dc9078bbd83ae2c1637cade8e 100644 (file)
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -47,29 +47,23 @@ extern "C" {
 #define S_ISLNK(mode)  (((mode) & S_IFMT) == S_IFLNK)
 #define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
 
+#ifndef S_IRUSR
 #define S_ISUID 04000
 #define S_ISGID 02000
 #define S_ISVTX 01000
-
-#define S_IREAD  0400
-#define S_IWRITE 0200
-#define S_IEXEC  0100
-
 #define S_IRUSR 0400
 #define S_IWUSR 0200
 #define S_IXUSR 0100
 #define S_IRWXU 0700
-
 #define S_IRGRP 0040
 #define S_IWGRP 0020
 #define S_IXGRP 0010
 #define S_IRWXG 0070
-
 #define S_IROTH 0004
 #define S_IWOTH 0002
 #define S_IXOTH 0001
 #define S_IRWXO 0007
-
+#endif
 
 int stat(const char *, struct stat *);
 int fstat(int, struct stat *);