* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Copy in i386/bits/fcntl.h.

diff --git a/ChangeLog b/ChangeLog
index 09de1f96a2aa7fb87e92678e1d207346b8015a31..1d3bcb8d95bba9ea2f0df9c0ef54a0f170e5bde2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-28  Roland McGrath  <roland@redhat.com>
+
+       * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Copy in i386/bits/fcntl.h.
+
 2006-02-27  Roland McGrath  <roland@redhat.com>
 
        * scripts/config.guess: Update from master, timestamp='2006-02-27'.

diff --git a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
index c8830026416fc7f99e09e65c0a03ec367069e711..9065825b98bbc69b6e4c9c797a5c72fe6218ab51 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
@@ -43,18 +43,18 @@
 #define O_ASYNC                 020000
 
 #ifdef __USE_GNU
-# define O_DIRECT       040000 /* Direct disk access.  */
-# define O_DIRECTORY   0200000 /* Must be a directory.  */
-# define O_NOFOLLOW    0400000 /* Do not follow links.  */
+# define O_DIRECT       040000 /* Direct disk access.  */
+# define O_DIRECTORY   0200000 /* Must be a directory.  */
+# define O_NOFOLLOW    0400000 /* Do not follow links.  */
 # define O_NOATIME     01000000 /* Do not set atime.  */
 #endif
 
 /* For now Linux has 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.  */
+   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.  */
+# define O_RSYNC       O_SYNC  /* Synchronize read operations.  */
 #endif
 
 #ifdef __USE_LARGEFILE64
@@ -70,15 +70,15 @@
 #ifndef __USE_FILE_OFFSET64
 # define F_GETLK       5       /* Get record locking info.  */
 # define F_SETLK       6       /* Set record locking info (non-blocking).  */
-# define F_SETLKW      7       /* Set record locking info (blocking).  */
+# define F_SETLKW      7       /* Set record locking info (blocking).  */
 #else
-# define F_GETLK       F_GETLK64  /* Get record locking info.  */
+# define F_GETLK       F_GETLK64  /* Get record locking info.  */
 # define F_SETLK       F_SETLK64  /* Set record locking info (non-blocking).*/
 # define F_SETLKW      F_SETLKW64 /* Set record locking info (blocking).  */
 #endif
 #define F_GETLK64      12      /* Get record locking info.  */
 #define F_SETLK64      13      /* Set record locking info (non-blocking).  */
-#define F_SETLKW64     14      /* Set record locking info (blocking).  */
+#define F_SETLKW64     14      /* Set record locking info (blocking).  */
 
 #if defined __USE_BSD || defined __USE_UNIX98
 # define F_SETOWN      8       /* Get owner of socket (receiver of SIGIO).  */
@@ -90,20 +90,26 @@
 # define F_GETSIG      11      /* Get number of signal to be sent.  */
 #endif
 
+#ifdef __USE_GNU
+# define F_SETLEASE    1024    /* Set a lease.  */
+# define F_GETLEASE    1025    /* Enquire what lease is active.  */
+# define F_NOTIFY      1026    /* Request notfications on a directory.  */
+#endif
+
 /* 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().  */
 #define F_RDLCK                0       /* Read lock.  */
-#define F_WRLCK                1       /* Write lock.  */
-#define F_UNLCK                2       /* Remove lock.  */
+#define F_WRLCK                1       /* Write lock.  */
+#define F_UNLCK                2       /* Remove lock.  */
 
 /* 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
@@ -111,9 +117,27 @@
 # define LOCK_UN       8       /* remove lock */
 #endif
 
+#ifdef __USE_GNU
+# define LOCK_MAND     32      /* This is a mandatory flock:   */
+# define LOCK_READ     64      /* ... which allows concurrent read operations.  */
+# define LOCK_WRITE    128     /* ... which allows concurrent write operations.  */
+# define LOCK_RW       192     /* ... Which allows concurrent read & write operations.  */
+#endif
+
+#ifdef __USE_GNU
+/* Types of directory notifications that may be requested with F_NOTIFY.  */
+# define DN_ACCESS     0x00000001      /* File accessed.  */
+# define DN_MODIFY     0x00000002      /* File modified.  */
+# define DN_CREATE     0x00000004      /* File created.  */
+# define DN_DELETE     0x00000008      /* File removed.  */
+# define DN_RENAME     0x00000010      /* File renamed.  */
+# define DN_ATTRIB     0x00000020      /* File changed attibutes.  */
+# define DN_MULTISHOT  0x80000000      /* Don't remove notifier.  */
+#endif
+
 struct flock
   {
-    short int l_type;  /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
+    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').  */
 #ifndef __USE_FILE_OFFSET64
     __off_t l_start;   /* Offset where the lock begins.  */
@@ -128,7 +152,7 @@ struct flock
 #ifdef __USE_LARGEFILE64
 struct flock64
   {
-    short int l_type;  /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
+    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').  */
     __off64_t l_start; /* Offset where the lock begins.  */
     __off64_t l_len;   /* Size of the locked area; zero means until EOF.  */
@@ -150,7 +174,7 @@ struct flock64
 #ifdef __USE_XOPEN2K
 # define POSIX_FADV_NORMAL     0 /* No further special treatment.  */
 # define POSIX_FADV_RANDOM     1 /* Expect random page references.  */
-# define POSIX_FADV_SEQUENTIAL 2 /* Expect sequential page references.  */
+# define POSIX_FADV_SEQUENTIAL 2 /* Expect sequential page references.  */
 # define POSIX_FADV_WILLNEED   3 /* Will need these pages.  */
 # define POSIX_FADV_DONTNEED   4 /* Don't need these pages.  */
 # define POSIX_FADV_NOREUSE    5 /* Data will be accessed once.  */