diff options
| author | Roland McGrath <roland@gnu.org> | 2002-07-31 23:30:24 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-07-31 23:30:24 +0000 |
| commit | b264e1d19a2d83fd6fbd842eddb285bc7b77471d (patch) | |
| tree | a4b4d1ab88eb9e3c0a973efb4c0295b78f7f113a /libio | |
| parent | 935f95dd364c8abc0da4cdaf9266eca936b48f98 (diff) | |
| download | glibc-b264e1d19a2d83fd6fbd842eddb285bc7b77471d.tar glibc-b264e1d19a2d83fd6fbd842eddb285bc7b77471d.tar.gz glibc-b264e1d19a2d83fd6fbd842eddb285bc7b77471d.tar.bz2 glibc-b264e1d19a2d83fd6fbd842eddb285bc7b77471d.zip | |
2002-07-31 Jeff Bailey <jbailey@gnu.org>
* libio/stdio.h (sys_errlist, sys_nerr, _sys_errlist, _sys_nerr):
Declarations moved to <bits/sys_errlist.h>. Include that file.
* libio/Makefile (headers): Add bits/sys_errlist.h to the list.
* sysdeps/generic/bits/sys_errlist.h: New file. This does *not*
declare sys_errlist and sys_nerr.
* sysdeps/unix/sysv/linux/bits/sys_errlist.h: New file. Does
provide declarations.
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/Makefile | 5 | ||||
| -rw-r--r-- | libio/stdio.h | 18 |
2 files changed, 9 insertions, 14 deletions
diff --git a/libio/Makefile b/libio/Makefile index 132634608f..f5e69e3e14 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1995,96,97,98,99,2000,2001,2002 Free Software Foundation, Inc. +# Copyright (C) 1995,96,97,98,99,2000,01,02 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 @@ -21,7 +21,8 @@ # subdir := libio -headers := stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h +headers := stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h \ + bits/sys_errlist.h routines := \ filedoalloc iofclose iofdopen iofflush iofgetpos iofgets iofopen \ diff --git a/libio/stdio.h b/libio/stdio.h index bcdf64d72e..10bd6e5e88 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -1,6 +1,5 @@ /* Define ISO C stdio on top of C++ iostreams. - Copyright (C) 1991, 1994-1999, 2000, 2001, 2002 - Free Software Foundation, Inc. + Copyright (C) 1991,1994-1999,2000,01,02 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 @@ -546,16 +545,11 @@ extern int ferror_unlocked (FILE *__stream) __THROW; /* Print a message describing the meaning of the value of errno. */ extern void perror (__const char *__s) __THROW; -/* These variables normally should not be used directly. The `strerror' - function provides all the needed functionality. */ -#ifdef __USE_BSD -extern int sys_nerr; -extern __const char *__const sys_errlist[]; -#endif -#ifdef __USE_GNU -extern int _sys_nerr; -extern __const char *__const _sys_errlist[]; -#endif +/* Provide the declarations for `sys_errlist' and `sys_nerr' if they + are available on this system. Even if available, these variables + should not be used directly. The `strerror' function provides + all the necessary functionality. */ +#include <bits/sys_errlist.h> #ifdef __USE_POSIX |