summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-04-14 21:49:22 -0400
committerRich Felker <dalias@aerifal.cx>2011-04-14 21:49:22 -0400
commitc2b18f3531b8cd2d5e2295626cff77b7765b356e (patch)
tree163285c88fa11e0997886e5038d7c1656a3ccb4e
parentace973637f5b38a02ac2699e38f282372042bf7c (diff)
downloadmusl-c2b18f3531b8cd2d5e2295626cff77b7765b356e.tar.gz
fcntl.h: move macros that do not vary between archs out of bits
-rw-r--r--arch/i386/bits/fcntl.h24
-rw-r--r--arch/x86_64/bits/fcntl.h24
-rw-r--r--include/fcntl.h24
3 files changed, 24 insertions, 48 deletions
diff --git a/arch/i386/bits/fcntl.h b/arch/i386/bits/fcntl.h
index 1b9861d7..fdc78736 100644
--- 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
@@ -42,22 +37,3 @@
#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 30fa2934..63e11638 100644
--- 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
@@ -42,22 +37,3 @@
#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 016653cf..6faf9cda 100644
--- 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);
+#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