From 992af677a8d77ac3a96aa228958a90fc15b09030 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 26 Oct 1998 11:44:32 +0000 Subject: [PATCH] Update. 1998-10-25 Andreas Jaeger * include/stdio.h: Included 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. --- ChangeLog | 9 +++++++++ include/stdio.h | 15 +++++++++++++++ libio/stdio.h | 12 ------------ stdio/stdio.h | 11 ----------- 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 + + * include/stdio.h: Included 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 * 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 #endif + +# define __need_size_t +# include +/* 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