Move xdr_* functions from nis/nis_xdr.h.

[kopensolaris-gnu/glibc.git] / io / fcntl.h

diff --git a/io/fcntl.h b/io/fcntl.h
index d47da0a..b75dc89 100644 (file)
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -32,6 +32,11 @@ __BEGIN_DECLS
    numbers and flag bits for `open', `fcntl', et al.  */
 #include <bits/fcntl.h>
 
+/* For Unix98 all symbols from <sys/stat.h> should also be available.  */
+#ifdef __USE_UNIX98
+# include <sys/stat.h>
+#endif
+
 #ifdef __USE_MISC
 # ifndef R_OK                  /* Verbatim from <unistd.h>.  Ugh.  */
 /* Values for the second argument to access.
@@ -56,8 +61,12 @@ extern int __open64 __P ((__const char *__file, int __oflag, ...));
 #ifndef __USE_FILE_OFFSET64
 extern int open __P ((__const char *__file, int __oflag, ...));
 #else
-extern int open __P ((__const char *__file, int __oflag, ...))
-     __asm__ ("open64");
+# ifdef __REDIRECT
+extern int __REDIRECT (open, __P ((__const char *__file, int __oflag, ...)),
+                      open64);
+# else
+#  define open open64
+# endif
 #endif
 #ifdef __USE_LARGEFILE64
 extern int open64 __P ((__const char *__file, int __oflag, ...));
@@ -69,14 +78,19 @@ extern int open64 __P ((__const char *__file, int __oflag, ...));
 #ifndef __USE_FILE_OFFSET64
 extern int creat __P ((__const char *__file, __mode_t __mode));
 #else
-extern int creat __P ((__const char *__file, __mode_t __mode))
-     __asm__ ("creat64");
+# ifdef __REDIRECT
+extern int __REDIRECT (creat, __P ((__const char *__file, __mode_t __mode)),
+                      creat64);
+# else
+#  define creat creat64
+# endif
 #endif
 #ifdef __USE_LARGEFILE64
 extern int creat64 __P ((__const char *__file, __mode_t __mode));
 #endif
 
-#if !defined F_LOCK && (defined __USE_MISC || defined __USE_XOPEN_EXTENDED)
+#if !defined F_LOCK && (defined __USE_MISC || (defined __USE_XOPEN_EXTENDED \
+                                              && !defined __USE_POSIX))
 /* NOTE: These declarations also appear in <unistd.h>; be sure to keep both
    files consistent.  Some systems have them there and some here, and some
    software depends on the macros being defined without including both.  */
@@ -93,8 +107,12 @@ extern int creat64 __P ((__const char *__file, __mode_t __mode));
 # ifndef __USE_FILE_OFFSET64
 extern int lockf __P ((int __fd, int __cmd, __off_t __len));
 # else
-extern int lockf __P ((int __fd, int __cmd, __off_t __len))
-     __asm__ ("lockf64");
+# ifdef __REDIRECT
+extern int __REDIRECT (lockf, __P ((int __fd, int __cmd, __off64_t __len)),
+                      lockf64);
+# else
+#  define lockf lockf64
+# endif
 # endif
 # ifdef __USE_LARGEFILE64
 extern int lockf64 __P ((int __fd, int __cmd, __off64_t __len));