* sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Reformat.

	(SPLICE_F_MOVE, SPLICE_F_NONBLOCK, SPLICE_F_MORE, SPLICE_F_GIFT):
	Define.

diff --git a/ChangeLog.mips b/ChangeLog.mips
index 6263540..16e092f 100644 (file)
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,9 @@
+2006-06-08  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Reformat.
+       (SPLICE_F_MOVE, SPLICE_F_NONBLOCK, SPLICE_F_MORE, SPLICE_F_GIFT):
+       Define.
+
 2006-06-02  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/mips/bits/resource.h (RLIM_INFINITY,

diff --git a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
index e7aae60..b6672b7 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
@@ -18,7 +18,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifndef _FCNTL_H
+#ifndef        _FCNTL_H
 # error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
 #endif
 
@@ -31,23 +31,20 @@
 
 /* open/fcntl - O_SYNC is only implemented on blocks devices and on files
    located on an ext2 file system */
-#define O_ACCMODE      0x0003
-#define O_RDONLY       0x0000
-#define O_WRONLY       0x0001
-#define O_RDWR         0x0002
-#define O_APPEND       0x0008
-#define O_SYNC         0x0010
-#define O_NONBLOCK     0x0080
-#define O_CREAT                0x0100  /* not fcntl */
-#define O_TRUNC                0x0200  /* not fcntl */
-#define O_EXCL         0x0400  /* not fcntl */
-#define O_NOCTTY       0x0800  /* not fcntl */
-#define O_FSYNC                O_SYNC
-#define O_ASYNC                0x1000
-
-#ifdef __USE_LARGEFILE64
-# define O_LARGEFILE   0x2000  /* Allow large file opens.  */
-#endif
+#define O_ACCMODE         0003
+#define O_RDONLY            00
+#define O_WRONLY            01
+#define O_RDWR              02
+#define O_APPEND        0x0008
+#define O_SYNC          0x0010
+#define O_NONBLOCK      0x0080
+#define O_NDELAY       O_NONBLOCK
+#define O_CREAT                 0x0100 /* not fcntl */
+#define O_TRUNC                 0x0200 /* not fcntl */
+#define O_EXCL          0x0400 /* not fcntl */
+#define O_NOCTTY        0x0800 /* not fcntl */
+#define O_FSYNC                 O_SYNC
+#define O_ASYNC                 0x1000
 
 #ifdef __USE_GNU
 # define O_NOFOLLOW    0x20000 /* Do not follow links.  */
@@ -56,16 +53,18 @@
 # define O_NOATIME     0x40000 /* Do not set atime.  */
 #endif
 
-#define O_NDELAY       O_NONBLOCK
-
-/* For now Linux has no synchronisity options for data and read
-   operations. We define the symbols here but let them do the same as
-   O_SYNC since this is a superset.  */
+/* For now Linux has no synchronisity options for data and read operations.
+   We define the symbols here but let them do the same as O_SYNC since
+   this is a superset. */
 #if defined __USE_POSIX199309 || defined __USE_UNIX98
 # define O_DSYNC       O_SYNC  /* Synchronize data.  */
 # define O_RSYNC       O_SYNC  /* Synchronize read operations.  */
 #endif
 
+#ifdef __USE_LARGEFILE64
+# define O_LARGEFILE   0x2000  /* Allow large file opens.  */
+#endif
+
 /* Values for the second argument to `fcntl'.  */
 #define F_DUPFD                0       /* Duplicate file descriptor.  */
 #define F_GETFD                1       /* Get file descriptor flags.  */
@@ -102,7 +101,7 @@
 # define F_NOTIFY      1026    /* Request notfications on a directory.  */
 #endif
 
-/* for F_[GET|SET]FL */
+/* For F_[GET|SET]FL.  */
 #define FD_CLOEXEC     1       /* actually anything with low bit set goes */
 
 /* For posix fcntl() and `l_type' field of a `struct flock' for lockf().  */
@@ -110,12 +109,12 @@
 #define F_WRLCK                1       /* Write lock.  */
 #define F_UNLCK                2       /* Remove lock.  */
 
-/* for old implementation of bsd flock () */
+/* For old implementation of bsd flock().  */
 #define F_EXLCK                4       /* or 3 */
 #define F_SHLCK                8       /* or 4 */
 
 #ifdef __USE_BSD
-/* Operations for bsd flock(), also used by the kernel implementation */
+/* Operations for bsd flock(), also used by the kernel implementation. */
 # define LOCK_SH       1       /* shared lock */
 # define LOCK_EX       2       /* exclusive lock */
 # define LOCK_NB       4       /* or'd with one of the above to prevent
@@ -141,7 +140,7 @@
 # define DN_MULTISHOT  0x80000000      /* Don't remove notifier.  */
 #endif
 
-typedef struct flock
+struct flock
   {
     short int l_type;  /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
     short int l_whence;        /* Where `l_start' is relative to (like `lseek').  */
@@ -163,7 +162,8 @@ typedef struct flock
        flock in o32 and n32, never has this field.  */
     long int pad[4];
 #endif
-} flock_t;
+  };
+typedef struct flock flock_t;
 
 #ifdef __USE_LARGEFILE64
 struct flock64
@@ -176,7 +176,6 @@ struct flock64
   };
 #endif
 
-
 /* Define some more compatibility macros to be backward compatible with
    BSD systems which did not managed to hide these kernel macros.  */
 #ifdef __USE_BSD
@@ -199,15 +198,24 @@ struct flock64
 
 
 #ifdef __USE_GNU
-# define SYNC_FILE_RANGE_WAIT_BEFORE    1 /* Wait upon writeout of all pages
-                                             in the range before performing the
-                                             write.  */
-# define SYNC_FILE_RANGE_WRITE          2 /* Initiate writeout of all those
-                                             dirty pages in the range which are
-                                             not presently under writeback.  */
-# define SYNC_FILE_RANGE_WAIT_AFTER     4 /* Wait upon writeout of all pages in
-                                             the range after performing the
-                                             write.  */
+/* Flags for SYNC_FILE_RANGE.  */
+# define SYNC_FILE_RANGE_WAIT_BEFORE   1 /* Wait upon writeout of all pages
+                                            in the range before performing the
+                                            write.  */
+# define SYNC_FILE_RANGE_WRITE         2 /* Initiate writeout of all those
+                                            dirty pages in the range which are
+                                            not presently under writeback.  */
+# define SYNC_FILE_RANGE_WAIT_AFTER    4 /* Wait upon writeout of all pages in
+                                            the range after performing the
+                                            write.  */
+
+/* Flags for SPLICE and VMSPLICE.  */
+# define SPLICE_F_MOVE         1       /* Move pages instead of copying.  */
+# define SPLICE_F_NONBLOCK     2       /* Don't block on the pipe splicing
+                                          (but we may still block on the fd
+                                          we splice from/to).  */
+# define SPLICE_F_MORE         4       /* Expect more data.  */
+# define SPLICE_F_GIFT         8       /* Pages passed in are a gift.  */
 #endif
 
 __BEGIN_DECLS
@@ -221,12 +229,12 @@ extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
 
 /* Selective file content synch'ing.  */
 extern int sync_file_range (int __fd, __off64_t __from, __off64_t __to,
-                            unsigned int __flags);
+                           unsigned int __flags);
 
 
 /* Splice address range into a pipe.  */
 extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
-                     unsigned int __flags);
+                    unsigned int __flags);
 
 /* Splice two files together.  */
 extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)