Sam Ravnborg
6d1f4b88ee
sparc: Merge asm-sparc{,64}/fcntl.h
The definition of O_NDELAY differed - the rest was equal
:$ diff -u include/asm-sparc/fcntl.h include/asm-sparc64/fcntl.h
:-- include/asm-sparc/fcntl.h 2008-06-13 06:46:39.000000000 +0200
:++ include/asm-sparc64/fcntl.h 2008-06-13 06:46:39.000000000 +0200
:@@ -1,8 +1,9 @@
:-#ifndef _SPARC_FCNTL_H
:-#define _SPARC_FCNTL_H
:+#ifndef _SPARC64_FCNTL_H
:+#define _SPARC64_FCNTL_H
:
: /* open/fcntl - O_SYNC is only implemented on blocks devices and on files
: located on an ext2 file system */
:+#define O_NDELAY 0x0004
: #define O_APPEND 0x0008
: #define FASYNC 0x0040 /* fcntl, for BSD compatibility */
: #define O_CREAT 0x0200 /* not fcntl */
:@@ -10,7 +11,6 @@
: #define O_EXCL 0x0800 /* not fcntl */
: #define O_SYNC 0x2000
: #define O_NONBLOCK 0x4000
:-#define O_NDELAY (0x0004 | O_NONBLOCK)
: #define O_NOCTTY 0x8000 /* not fcntl */
: #define O_LARGEFILE 0x40000
: #define O_DIRECT 0x100000 /* direct disk access hint */
:@@ -29,8 +29,7 @@
: #define F_UNLCK 3
:
: #define __ARCH_FLOCK_PAD short __unused;
:-#define __ARCH_FLOCK64_PAD short __unused;
:
: #include <asm-generic/fcntl.h>
:
:-#endif
:+#endif /* !(_SPARC64_FCNTL_H) */
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2008-07-17 21:41:39 -07:00
..
2008-07-16 17:25:46 -07:00
2008-06-26 11:24:35 +02:00
2008-07-16 15:17:52 -07:00
2008-07-15 14:14:49 +02:00
2008-06-19 17:46:39 +08:00
2008-07-12 14:33:42 -07:00
2008-07-16 17:25:46 -07:00
2008-07-16 23:27:05 +02:00
2008-06-26 11:22:57 +02:00
2008-07-16 15:17:52 -07:00
2008-06-26 11:22:57 +02:00
2008-07-16 11:07:59 +10:00
2008-07-17 17:22:10 +02:00
2008-06-26 11:22:58 +02:00
2008-07-17 21:41:39 -07:00
2008-07-17 21:41:39 -07:00
2008-07-17 10:38:59 -07:00
2008-07-10 20:35:18 +08:00
2008-07-15 15:48:05 +10:00
2008-07-17 10:55:51 -07:00
2008-06-26 15:58:57 -03:00
2008-07-01 19:52:38 -07:00
2008-06-24 15:33:44 +02:00
2008-07-14 23:48:53 -07:00
2008-07-15 18:58:04 -07:00
2008-07-14 09:54:43 +02:00
2008-06-25 15:17:23 +02:00
2008-07-14 10:45:01 +10:00