瀏覽代碼

fcntl.h: O_SEARCH was missing for powerpc

put some macros that do not differ between architectures in the
main header and remove from bits.
restructure mips header so it has the same structure as the others.
rofl0r 12 年之前
父節點
當前提交
8d2887f884
共有 6 個文件被更改,包括 13 次插入24 次删除
  1. 0 3
      arch/arm/bits/fcntl.h
  2. 0 3
      arch/i386/bits/fcntl.h
  3. 0 3
      arch/microblaze/bits/fcntl.h
  4. 9 12
      arch/mips/bits/fcntl.h
  5. 0 3
      arch/x86_64/bits/fcntl.h
  6. 4 0
      include/fcntl.h

+ 0 - 3
arch/arm/bits/fcntl.h

@@ -10,15 +10,12 @@
 #define O_DIRECTORY  040000
 #define O_NOFOLLOW  0100000
 #define O_CLOEXEC  02000000
-#define O_SEARCH  010000000
-#define O_EXEC    010000000
 
 #define O_ASYNC      020000
 #define O_DIRECT    0200000
 #define O_LARGEFILE 0400000
 #define O_NOATIME  01000000
 #define O_NDELAY O_NONBLOCK
-#define O_PATH    010000000
 
 #define F_DUPFD  0
 #define F_GETFD  1

+ 0 - 3
arch/i386/bits/fcntl.h

@@ -10,15 +10,12 @@
 #define O_DIRECTORY 0200000
 #define O_NOFOLLOW  0400000
 #define O_CLOEXEC  02000000
-#define O_SEARCH  010000000
-#define O_EXEC    010000000
 
 #define O_ASYNC      020000
 #define O_DIRECT     040000
 #define O_LARGEFILE 0100000
 #define O_NOATIME  01000000
 #define O_NDELAY O_NONBLOCK
-#define O_PATH    010000000
 
 #define F_DUPFD  0
 #define F_GETFD  1

+ 0 - 3
arch/microblaze/bits/fcntl.h

@@ -10,15 +10,12 @@
 #define O_DIRECTORY 0200000
 #define O_NOFOLLOW  0400000
 #define O_CLOEXEC  02000000
-#define O_SEARCH  010000000
-#define O_EXEC    010000000
 
 #define O_ASYNC      020000
 #define O_DIRECT     040000
 #define O_LARGEFILE 0100000
 #define O_NOATIME  01000000
 #define O_NDELAY O_NONBLOCK
-#define O_PATH    010000000
 
 #define F_DUPFD  0
 #define F_GETFD  1

+ 9 - 12
arch/mips/bits/fcntl.h

@@ -1,23 +1,20 @@
+#define O_CREAT        0400
+#define O_EXCL        02000
+#define O_NOCTTY      04000
+#define O_TRUNC       01000
 #define O_APPEND       0010
+#define O_NONBLOCK     0200
 #define O_DSYNC        0020
 #define O_SYNC       040020
 #define O_RSYNC      040020
-#define O_NONBLOCK     0200
-#define O_CREAT        0400
-#define O_TRUNC       01000
-#define O_EXCL        02000
-#define O_NOCTTY      04000
-#define O_ASYNC      010000
-#define O_LARGEFILE  020000
-#define O_DIRECT    0100000
 #define O_DIRECTORY 0200000
 #define O_NOFOLLOW  0400000
-#define O_NOATIME  01000000
 #define O_CLOEXEC  02000000
-#define O_PATH    010000000
-#define O_SEARCH  010000000
-#define O_EXEC    010000000
 
+#define O_ASYNC      010000
+#define O_DIRECT    0100000
+#define O_LARGEFILE  020000
+#define O_NOATIME  01000000
 #define O_NDELAY O_NONBLOCK
 
 #define F_DUPFD  0

+ 0 - 3
arch/x86_64/bits/fcntl.h

@@ -10,15 +10,12 @@
 #define O_DIRECTORY 0200000
 #define O_NOFOLLOW  0400000
 #define O_CLOEXEC  02000000
-#define O_SEARCH  010000000
-#define O_EXEC    010000000
 
 #define O_ASYNC      020000
 #define O_DIRECT     040000
 #define O_LARGEFILE       0
 #define O_NOATIME  01000000
 #define O_NDELAY O_NONBLOCK
-#define O_PATH    010000000
 
 #define F_DUPFD  0
 #define F_GETFD  1

+ 4 - 0
include/fcntl.h

@@ -37,6 +37,10 @@ int openat(int, const char *, int, ...);
 int posix_fadvise(int, off_t, off_t, int);
 int posix_fallocate(int, off_t, off_t);
 
+#define O_SEARCH  010000000
+#define O_EXEC    010000000
+#define O_PATH    010000000
+
 #define O_ACCMODE (03|O_SEARCH)
 #define O_RDONLY  00
 #define O_WRONLY  01