aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--include/fcntl.h2
-rw-r--r--io/fcntl.h4
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 28df2943c0..40a747b97c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-05 Andreas Jaeger <aj@suse.de>
+
+ * io/fcntl.h: Move __fcntl and __open to...
+ * include/fcntl.h: ...here.
+
2001-02-04 Philip Blundell <philb@gnu.org>
* configure.in: Distinguish ARM from Thumb.
diff --git a/include/fcntl.h b/include/fcntl.h
index fae0beb064..748854a023 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -6,5 +6,7 @@ extern int __open64 (__const char *__file, int __oflag, ...);
extern int __libc_open64 (const char *file, int oflag, ...);
extern int __libc_open (const char *file, int oflag, ...);
extern int __libc_fcntl (int fd, int cmd, ...);
+extern int __open (__const char *__file, int __oflag, ...);
+extern int __fcntl (int __fd, int __cmd, ...) __THROW;
#endif
diff --git a/io/fcntl.h b/io/fcntl.h
index 7ab542642c..da5569b3e9 100644
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,96,97,98,99,2000,2001 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
@@ -57,13 +57,11 @@ __BEGIN_DECLS
/* Do the file control operation described by CMD on FD.
The remaining arguments are interpreted depending on CMD. */
-extern int __fcntl (int __fd, int __cmd, ...) __THROW;
extern int fcntl (int __fd, int __cmd, ...) __THROW;
/* Open FILE and return a new file descriptor for it, or -1 on error.
OFLAG determines the type of access used. If O_CREAT is on OFLAG,
the third argument is taken as a `mode_t', the mode of the created file. */
-extern int __open (__const char *__file, int __oflag, ...) __THROW;
#ifndef __USE_FILE_OFFSET64
extern int open (__const char *__file, int __oflag, ...) __THROW;
#else