fcntl.h: move macros that do not vary between archs out of bits

diff --git a/arch/i386/bits/fcntl.h b/arch/i386/bits/fcntl.h
index 1b9861d..fdc7873 100644 (file)
--- a/arch/i386/bits/fcntl.h
+++ b/arch/i386/bits/fcntl.h
@@ -1,8 +1,3 @@
-#define O_ACCMODE 03
-#define O_RDONLY  00
-#define O_WRONLY  01
-#define O_RDWR    02
-

 #define O_CREAT        0100
 #define O_EXCL         0200
 #define O_NOCTTY       0400
 #define O_CREAT        0100
 #define O_EXCL         0200
 #define O_NOCTTY       0400


@@ -42,22 +37,3 @@
 #define F_GETLK 12
 #define F_SETLK 13
 #define F_SETLKW 14
 #define F_GETLK 12
 #define F_SETLK 13
 #define F_SETLKW 14

-
-#define FD_CLOEXEC 1
-
-#define F_RDLCK 0
-#define F_WRLCK 1
-#define F_UNLCK 2
-
-#define AT_FDCWD (-100)
-#define AT_SYMLINK_NOFOLLOW 0x100
-#define AT_REMOVEDIR 0x200
-#define AT_SYMLINK_FOLLOW 0x400
-#define AT_EACCESS 0x200
-
-#define POSIX_FADV_NORMAL     0
-#define POSIX_FADV_RANDOM     1
-#define POSIX_FADV_SEQUENTIAL 2
-#define POSIX_FADV_WILLNEED   3
-#define POSIX_FADV_DONTNEED   4
-#define POSIX_FADV_NOREUSE    5

diff --git a/arch/x86_64/bits/fcntl.h b/arch/x86_64/bits/fcntl.h
index 30fa293..63e1163 100644 (file)
--- a/arch/x86_64/bits/fcntl.h
+++ b/arch/x86_64/bits/fcntl.h
@@ -1,8 +1,3 @@
-#define O_ACCMODE 03
-#define O_RDONLY  00
-#define O_WRONLY  01
-#define O_RDWR    02
-

 #define O_CREAT        0100
 #define O_EXCL         0200
 #define O_NOCTTY       0400
 #define O_CREAT        0100
 #define O_EXCL         0200
 #define O_NOCTTY       0400


@@ -42,22 +37,3 @@
 #define F_GETLK 5
 #define F_SETLK 6
 #define F_SETLKW 7
 #define F_GETLK 5
 #define F_SETLK 6
 #define F_SETLKW 7

-
-#define FD_CLOEXEC 1
-
-#define F_RDLCK 0
-#define F_WRLCK 1
-#define F_UNLCK 2
-
-#define AT_FDCWD (-100)
-#define AT_SYMLINK_NOFOLLOW 0x100
-#define AT_REMOVEDIR 0x200
-#define AT_SYMLINK_FOLLOW 0x400
-#define AT_EACCESS 0x200
-
-#define POSIX_FADV_NORMAL     0
-#define POSIX_FADV_RANDOM     1
-#define POSIX_FADV_SEQUENTIAL 2
-#define POSIX_FADV_WILLNEED   3
-#define POSIX_FADV_DONTNEED   4
-#define POSIX_FADV_NOREUSE    5

diff --git a/include/fcntl.h b/include/fcntl.h
index 016653c..6faf9cd 100644 (file)
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -29,6 +29,30 @@ int openat(int, const char *, int, ...);
 int posix_fadvise(int, off_t, off_t, int);
 int posix_fallocate(int, off_t, off_t);
 
 int posix_fadvise(int, off_t, off_t, int);
 int posix_fallocate(int, off_t, off_t);
 

+#define O_ACCMODE 03
+#define O_RDONLY  00
+#define O_WRONLY  01
+#define O_RDWR    02
+
+#define F_RDLCK 0
+#define F_WRLCK 1
+#define F_UNLCK 2
+
+#define FD_CLOEXEC 1
+
+#define AT_FDCWD (-100)
+#define AT_SYMLINK_NOFOLLOW 0x100
+#define AT_REMOVEDIR 0x200
+#define AT_SYMLINK_FOLLOW 0x400
+#define AT_EACCESS 0x200
+
+#define POSIX_FADV_NORMAL     0
+#define POSIX_FADV_RANDOM     1
+#define POSIX_FADV_SEQUENTIAL 2
+#define POSIX_FADV_WILLNEED   3
+#define POSIX_FADV_DONTNEED   4
+#define POSIX_FADV_NOREUSE    5
+

 #undef SEEK_SET
 #undef SEEK_CUR
 #undef SEEK_END
 #undef SEEK_SET
 #undef SEEK_CUR
 #undef SEEK_END