summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--include/stdio.h15
-rw-r--r--libio/stdio.h12
-rw-r--r--stdio/stdio.h11
4 files changed, 24 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index c801687dd9..852f28b30a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1998-10-25 Andreas Jaeger <aj@arthur.rhein-neckar.de>
+
+ * include/stdio.h: Included <stddef.h> for size_t.
+
+ * stdio/stdio.h: Move __path_search, __gen_tempname, __libc_fatal
+ to ...
+ * include/stdio.h: ...here.
+ * libio/stdio.h: Removed __path_search, __gen_tempname, __libc_fatal.
+
1998-10-26 11:09 Ulrich Drepper <drepper@cygnus.com>
* time/Makefile (tests): Add tst-posixtz.
diff --git a/include/stdio.h b/include/stdio.h
index a3272fc8e9..071ce9f051 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -28,4 +28,19 @@ extern int __vsscanf __P ((__const char *__restrict __s,
#else
#include <stdio/stdio.h>
#endif
+
+# define __need_size_t
+# include <stddef.h>
+/* Generate a unique file name (and possibly open it). */
+extern int __path_search __P ((char *__tmpl, size_t __tmpl_len,
+ __const char *__dir,
+ __const char *__pfx));
+
+extern int __gen_tempname __P ((char *__tmpl, int __openit, int __large_file));
+
+/* Print out MESSAGE on the error output and abort. */
+extern void __libc_fatal __P ((__const char *__message))
+ __attribute__ ((__noreturn__));
+
+
#endif
diff --git a/libio/stdio.h b/libio/stdio.h
index 002cb8baef..4fd2e99453 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -72,18 +72,6 @@ typedef _G_fpos64_t fpos_t;
typedef _G_fpos64_t fpos64_t;
#endif
-/* Generate a unique file name (and possibly open it). */
-extern int __path_search __P ((char *__tmpl, size_t __tmpl_len,
- __const char *__dir,
- __const char *__pfx));
-
-extern int __gen_tempname __P ((char *__tmpl, int __openit, int __large_file));
-
-/* Print out MESSAGE on the error output and abort. */
-extern void __libc_fatal __P ((__const char *__message))
- __attribute__ ((__noreturn__));
-
-
/* The possibilities for the third argument to `setvbuf'. */
#define _IOFBF 0 /* Fully buffered. */
#define _IOLBF 1 /* Line buffered. */
diff --git a/stdio/stdio.h b/stdio/stdio.h
index 3bbe617aa2..a48a07fe6d 100644
--- a/stdio/stdio.h
+++ b/stdio/stdio.h
@@ -156,17 +156,6 @@ extern int __stdio_open __P ((__const char *__file, __io_mode __m,
/* Put out an error message for when stdio needs to die. */
extern void __stdio_errmsg __P ((__const char *__msg, size_t __len));
-/* Generate a unique file name (and possibly open it). */
-extern int __path_search __P ((char *__tmpl, size_t __tmpl_len,
- __const char *__dir,
- __const char *__pfx));
-
-extern int __gen_tempname __P ((char *__tmpl, int __openit, int __large_file));
-
-
-/* Print out MESSAGE on the error output and abort. */
-extern void __libc_fatal __P ((__const char *__message))
- __attribute__ ((__noreturn__));
/* For thread safe I/O functions we need a lock in each stream. We