Update.

2000-04-30  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/generic/bits/fcntl.h (F_SETOWN, F_GETOWN): Make
	available if __USE_XOPEN2K.
	* sysdeps/mach/hurd/bits/fcntl.h: Likewise.
	* sysdeps/unix/common/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/aix/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/bits/fcntl.h: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 7ee4821..24cdb64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-04-30  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/generic/bits/fcntl.h (F_SETOWN, F_GETOWN): Make
+       available if __USE_XOPEN2K.
+       * sysdeps/mach/hurd/bits/fcntl.h: Likewise.
+       * sysdeps/unix/common/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/aix/bits/fcntl.h: Likewise.
+       * sysdeps/unix/sysv/linux/bits/fcntl.h: Likewise.
+
 2000-04-29  Ulrich Drepper  <drepper@redhat.com>
 
        * iconv/iconv_prog.c (main): Handle input file name "-" correctly.

diff --git a/bits/fcntl.h b/bits/fcntl.h
index 2984100..444cfb0 100644 (file)
--- a/bits/fcntl.h
+++ b/bits/fcntl.h
@@ -20,7 +20,7 @@
 /* These values should be changed as appropriate for your system.  */
 
 #ifndef        _FCNTL_H
-#error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
+# error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
 #endif
 
 
@@ -41,7 +41,7 @@
 #define        O_NONBLOCK      0x0004  /* Non-blocking I/O.  */
 
 #ifdef __USE_BSD
-#define        O_NDELAY        O_NONBLOCK
+# define O_NDELAY      O_NONBLOCK
 #endif
 
 /* Mask for file access modes.  This is system-dependent in case
@@ -54,9 +54,9 @@
 #define        F_SETFD         2       /* Set file descriptor flags.  */
 #define        F_GETFL         3       /* Get file status flags.  */
 #define        F_SETFL         4       /* Set file status flags.  */
-#ifdef __USE_BSD
-#define        F_GETOWN        5       /* Get owner (receiver of SIGIO).  */
-#define        F_SETOWN        6       /* Set owner (receiver of SIGIO).  */
+#if defined __USE_BSD || defined __USE_XOPEN2K
+# define F_GETOWN      5       /* Get owner (receiver of SIGIO).  */
+# define F_SETOWN      6       /* Set owner (receiver of SIGIO).  */
 #endif
 #define        F_GETLK         7       /* Get record locking info.  */
 #define        F_SETLK         8       /* Set record locking info.  */

diff --git a/sysdeps/generic/bits/fcntl.h b/sysdeps/generic/bits/fcntl.h
index 2984100..444cfb0 100644 (file)
--- a/sysdeps/generic/bits/fcntl.h
+++ b/sysdeps/generic/bits/fcntl.h
@@ -20,7 +20,7 @@
 /* These values should be changed as appropriate for your system.  */
 
 #ifndef        _FCNTL_H
-#error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
+# error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
 #endif
 
 
@@ -41,7 +41,7 @@
 #define        O_NONBLOCK      0x0004  /* Non-blocking I/O.  */
 
 #ifdef __USE_BSD
-#define        O_NDELAY        O_NONBLOCK
+# define O_NDELAY      O_NONBLOCK
 #endif
 
 /* Mask for file access modes.  This is system-dependent in case
@@ -54,9 +54,9 @@
 #define        F_SETFD         2       /* Set file descriptor flags.  */
 #define        F_GETFL         3       /* Get file status flags.  */
 #define        F_SETFL         4       /* Set file status flags.  */
-#ifdef __USE_BSD
-#define        F_GETOWN        5       /* Get owner (receiver of SIGIO).  */
-#define        F_SETOWN        6       /* Set owner (receiver of SIGIO).  */
+#if defined __USE_BSD || defined __USE_XOPEN2K
+# define F_GETOWN      5       /* Get owner (receiver of SIGIO).  */
+# define F_SETOWN      6       /* Set owner (receiver of SIGIO).  */
 #endif
 #define        F_GETLK         7       /* Get record locking info.  */
 #define        F_SETLK         8       /* Set record locking info.  */

diff --git a/sysdeps/mach/hurd/bits/fcntl.h b/sysdeps/mach/hurd/bits/fcntl.h
index b5696eb..b49a0e3 100644 (file)
--- a/sysdeps/mach/hurd/bits/fcntl.h
+++ b/sysdeps/mach/hurd/bits/fcntl.h
@@ -148,7 +148,7 @@
 #define        F_SETFD         2       /* Set file descriptor flags.  */
 #define        F_GETFL         3       /* Get file status flags.  */
 #define        F_SETFL         4       /* Set file status flags.  */
-#ifdef __USE_BSD
+#if defined __USE_BSD || defined __USE_XOPEN2K
 # define F_GETOWN      5       /* Get owner (receiver of SIGIO).  */
 # define F_SETOWN      6       /* Set owner (receiver of SIGIO).  */
 #endif

diff --git a/sysdeps/unix/common/bits/fcntl.h b/sysdeps/unix/common/bits/fcntl.h
index 31f213e..f38898e 100644 (file)
--- a/sysdeps/unix/common/bits/fcntl.h
+++ b/sysdeps/unix/common/bits/fcntl.h
@@ -1,5 +1,5 @@
 /* O_*, F_*, FD_* bit values for general Unix system.
-   Copyright (C) 1991, 1992, 1995, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1995, 1997, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,7 +18,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #ifndef        _FCNTL_H
-#error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
+# error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead."
 #endif
 
 
@@ -34,9 +34,9 @@
 #define        O_TRUNC         0x0200  /* Truncate file to zero length.  */
 #define        O_NOCTTY        0x0800  /* Don't assign a controlling terminal.  */
 #ifdef __USE_MISC
-#define        O_ASYNC         0x0040  /* Send SIGIO to owner when data is ready.  */
-#define        O_FSYNC         0x0010  /* Synchronous writes.  */
-#define        O_SYNC          O_FSYNC
+# define O_ASYNC       0x0040  /* Send SIGIO to owner when data is ready.  */
+# define O_FSYNC       0x0010  /* Synchronous writes.  */
+# define O_SYNC                O_FSYNC
 #endif
 
 /* File status flags for `open' and `fcntl'.  */
@@ -44,7 +44,7 @@
 #define        O_NONBLOCK      0x0080  /* Non-blocking I/O.  */
 
 #ifdef __USE_MISC
-#define        O_NDELAY        0x0004
+# define O_NDELAY      0x0004
 #endif
 
 #ifdef __USE_MISC
@@ -52,21 +52,21 @@
    These are all the O_* flags, plus FREAD and FWRITE, which are
    independent bits set by which of O_RDONLY, O_WRONLY, and O_RDWR, was
    given to `open'.  */
-#define FREAD          1
-#define        FWRITE          2
+# define FREAD         1
+# define FWRITE                2
 
 /* Traditional Unix names the O_* bits.  */
-#define FASYNC         O_ASYNC
-#define FCREAT         O_CREAT
-#define FEXCL          O_EXCL
-#define FTRUNC         O_TRUNC
-#define FNOCTTY                O_NOCTTY
-#define FFSYNC         O_FSYNC
-#define FSYNC          O_SYNC
-#define FAPPEND                O_APPEND
-#define FNONBLOCK      O_NONBLOCK
-#define FNONBIO                O_NONBLOCK
-#define FNDELAY                O_NDELAY
+# define FASYNC                O_ASYNC
+# define FCREAT                O_CREAT
+# define FEXCL         O_EXCL
+# define FTRUNC                O_TRUNC
+# define FNOCTTY       O_NOCTTY
+# define FFSYNC                O_FSYNC
+# define FSYNC         O_SYNC
+# define FAPPEND       O_APPEND
+# define FNONBLOCK     O_NONBLOCK
+# define FNONBIO       O_NONBLOCK
+# define FNDELAY       O_NDELAY
 #endif
 
 /* Mask for file access modes.  This is system-dependent in case
@@ -79,19 +79,19 @@
 #define        F_SETFD         2       /* Set file descriptor flags.  */
 #define        F_GETFL         3       /* Get file status flags.  */
 #define        F_SETFL         4       /* Set file status flags.  */
-#ifdef __USE_BSD
-#define        F_GETOWN        23      /* Get owner (receiver of SIGIO).  */
-#define        F_SETOWN        24      /* Set owner (receiver of SIGIO).  */
+#if defined __USE_BSD || defined __USE_XOPEN2K
+# define F_GETOWN      23      /* Get owner (receiver of SIGIO).  */
+# define F_SETOWN      24      /* Set owner (receiver of SIGIO).  */
 #endif
 #define        F_GETLK         14      /* Get record locking info.  */
 #define        F_SETLK         6       /* Set record locking info (non-blocking).  */
 #define        F_SETLKW        7       /* Set record locking info (blocking).  */
 #ifdef __USE_SVID
-#define        F_ALLOCSP       10      /* Allocate space in the file.  */
-#define        F_FREESP        11      /* Free space in the file.  */
-#define        F_RGETLK        20      /* Get remote record locking info.  */
-#define        F_RSETLK        21      /* Set remote locking info (non-blocking).  */
-#define        F_RSETLKW       22      /* Set remote locking info (blocking).  */
+# define F_ALLOCSP     10      /* Allocate space in the file.  */
+# define F_FREESP      11      /* Free space in the file.  */
+# define F_RGETLK      20      /* Get remote record locking info.  */
+# define F_RSETLK      21      /* Set remote locking info (non-blocking).  */
+# define F_RSETLKW     22      /* Set remote locking info (blocking).  */
 #endif
 
 /* File descriptor flags used with F_GETFD and F_SETFD.  */

diff --git a/sysdeps/unix/sysv/aix/bits/fcntl.h b/sysdeps/unix/sysv/aix/bits/fcntl.h
index 039a604..048f53a 100644 (file)
--- a/sysdeps/unix/sysv/aix/bits/fcntl.h
+++ b/sysdeps/unix/sysv/aix/bits/fcntl.h
@@ -1,5 +1,5 @@
 /* O_*, F_*, FD_* bit values for Linux.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -74,7 +74,7 @@
 # define F_SETLKW64     13     /* Set record locking info (blocking).  */
 #endif
 
-#ifdef __USE_BSD
+#if defined __USE_BSD || defined __USE_XOPEN2K
 # define F_SETOWN      8       /* Get owner of socket (receiver of SIGIO).  */
 # define F_GETOWN      9       /* Set owner of socket (receiver of SIGIO).  */
 #endif

diff --git a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
index 7081119..7184d08 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
@@ -77,7 +77,7 @@
 #define F_SETLK64      8       /* Set record locking info (non-blocking).  */
 #define F_SETLKW64     9       /* Set record locking info (blocking).  */
 
-#ifdef __USE_BSD
+#if defined __USE_BSD || defined __USE_XOPEN2K
 # define F_SETOWN      5       /* Get owner of socket (receiver of SIGIO).  */
 # define F_GETOWN      6       /* Set owner of socket (receiver of SIGIO).  */
 #endif

diff --git a/sysdeps/unix/sysv/linux/bits/fcntl.h b/sysdeps/unix/sysv/linux/bits/fcntl.h
index 9714b56..16a9f64 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/bits/fcntl.h
@@ -74,7 +74,7 @@
 #define F_SETLK64      6       /* Set record locking info (non-blocking).  */
 #define F_SETLKW64     7       /* Set record locking info (blocking).  */
 
-#ifdef __USE_BSD
+#if defined __USE_BSD || defined __USE_XOPEN2K
 # define F_SETOWN      8       /* Get owner of socket (receiver of SIGIO).  */
 # define F_GETOWN      9       /* Set owner of socket (receiver of SIGIO).  */
 #endif

diff --git a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
index b5db2b7..4e19bf1 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
@@ -74,7 +74,7 @@
 #define F_SETLK64      6       /* Set record locking info (non-blocking).  */
 #define F_SETLKW64     7       /* Set record locking info (blocking).  */
 
-#ifdef __USE_BSD
+#if defined __USE_BSD || defined __USE_XOPEN2K
 # define F_SETOWN      8       /* Get owner of socket (receiver of SIGIO).  */
 # define F_GETOWN      9       /* Set owner of socket (receiver of SIGIO).  */
 #endif

diff --git a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
index 1803576..189601c 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
@@ -75,7 +75,7 @@
 #define F_SETLK64      6       /* Set record locking info (non-blocking).  */
 #define F_SETLKW64     7       /* Set record locking info (blocking).  */
 
-#ifdef __USE_BSD
+#if defined __USE_BSD || defined __USE_XOPEN2K
 # define F_SETOWN      24      /* Get owner of socket (receiver of SIGIO).  */
 # define F_GETOWN      23      /* Set owner of socket (receiver of SIGIO).  */
 #endif

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index efdf50d..cee74b7 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -75,7 +75,7 @@
 #define F_SETFD                2       /* Set file descriptor flags.  */
 #define F_GETFL                3       /* Get file status flags.  */
 #define F_SETFL                4       /* Set file status flags.  */
-#ifdef __USE_BSD
+#if defined __USE_BSD || defined __USE_XOPEN2K
 # define F_GETOWN      5       /* Get owner of socket (receiver of SIGIO).  */
 # define F_SETOWN      6       /* Set owner of socket (receiver of SIGIO).  */
 #endif