Rev all the header files to sync things with glibc 2.2.4

1 files changed, 38 insertions, 17 deletions

diff --git a/include/sys/file.h b/include/sys/file.h
index 2401b155a..93b36350a 100644
--- a/include/sys/file.h
+++ b/include/sys/file.h
@@ -1,35 +1,56 @@
-#ifndef _SYS_FILE_H
-#define _SYS_FILE_H
+/* Copyright (C) 1991, 92, 96, 97, 98, 99 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef	_SYS_FILE_H
+#define	_SYS_FILE_H	1
 
 #include <features.h>
-#include <fcntl.h>
 
-#ifndef L_SET
+#ifndef	_FCNTL_H
+# include <fcntl.h>
+#endif
+
+__BEGIN_DECLS
 
-#define L_SET           0       /* absolute offset */
-#define L_INCR          1       /* relative to current offset */
-#define L_XTND          2       /* relative to end of file */
 
+/* Alternate names for values for the WHENCE argument to `lseek'.
+   These are the same as SEEK_SET, SEEK_CUR, and SEEK_END, respectively.  */
+#ifndef L_SET
+# define L_SET	0	/* Seek from beginning of file.  */
+# define L_INCR	1	/* Seek from current position.  */
+# define L_XTND	2	/* Seek from end of file.  */
 #endif
 
-#ifndef LOCK_SH
 
 /* Operations for the `flock' call.  */
-#define LOCK_SH       1    /* Shared lock.  */
-#define LOCK_EX       2    /* Exclusive lock.  */
-#define LOCK_UN       8    /* Unlock.  */
+#define	LOCK_SH	1	/* Shared lock.  */
+#define	LOCK_EX	2 	/* Exclusive lock.  */
+#define	LOCK_UN	8	/* Unlock.  */
 
 /* Can be OR'd in to one of the above.  */
-#define LOCK_NB       4    /* Don't block when locking.  */
+#define	LOCK_NB	4	/* Don't block when locking.  */
 
-#endif
-
-__BEGIN_DECLS
 
 /* Apply or remove an advisory lock, according to OPERATION,
    on the file FD refers to.  */
-extern int flock __P ((int __fd, int __operation));
+extern int flock (int __fd, int __operation) __THROW;
+
 
 __END_DECLS
 
-#endif
+#endif /* sys/file.h  */