summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-07-12 13:29:44 +0000
committerJakub Jelinek <jakub@redhat.com>2007-07-12 13:29:44 +0000
commit13a4ee0bb4ccb6691729bde67233f5ca66209c7c (patch)
tree72d62fed4d091a1f38c021d9c3eab5e50044e8c4 /include
parent0923a2c896f09795cca4a6d800a336a56b0ee42c (diff)
[BZ #4745]
[BZ #4586] [BZ #4702] [BZ #4525] [BZ #4514] [BZ #4512] Merge selected bugfixes from the trunk.
Diffstat (limited to 'include')
-rw-r--r--include/bits/fcntl2.h1
-rw-r--r--include/fcntl.h5
-rw-r--r--include/stdio.h1
3 files changed, 0 insertions, 7 deletions
diff --git a/include/bits/fcntl2.h b/include/bits/fcntl2.h
deleted file mode 100644
index 832b2c9abb..0000000000
--- a/include/bits/fcntl2.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../io/bits/fcntl2.h"
diff --git a/include/fcntl.h b/include/fcntl.h
index 1e919befb6..e23af1c3d3 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -24,11 +24,6 @@ extern int __openat64 (int __fd, __const char *__file, int __oflag, ...)
__nonnull ((2));
libc_hidden_proto (__openat64)
-extern int __open_2 (__const char *__path, int __oflag);
-extern int __open64_2 (__const char *__path, int __oflag);
-extern int __openat_2 (int __fd, __const char *__path, int __oflag);
-extern int __openat64_2 (int __fd, __const char *__path, int __oflag);
-
/* Helper functions for the various *at functions. For Linux. */
extern void __atfct_seterrno (int errval, int fd, const char *buf)
diff --git a/include/stdio.h b/include/stdio.h
index 6fe881cd97..b293b8f1c7 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -65,7 +65,6 @@ extern int __gen_tempname (char *__tmpl, int __kind);
extern void __libc_fatal (__const char *__message)
__attribute__ ((__noreturn__));
extern void __libc_message (int do_abort, __const char *__fnt, ...);
-extern void __fortify_fail (const char *msg) __attribute__ ((noreturn));
/* Acquire ownership of STREAM. */
extern void __flockfile (FILE *__stream);