qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Roland McGrath 2002-07-31 23:30:24 +00:00
parent 935f95dd36
commit b264e1d19a
6 changed files with 100 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
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.
2002-07-31 Roland McGrath <roland@frob.com> 2002-07-31 Roland McGrath <roland@frob.com>
* elf/rtld.c (dl_main): Fix typo in error message. * elf/rtld.c (dl_main): Fix typo in error message.

24
bits/sys_errlist.h Normal file
View File

@ -0,0 +1,24 @@
/* Declare sys_errlist and sys_nerr, or don't. Don't version.
Copyright (C) 2002 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
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#ifndef _STDIO_H
# error "Never include <bits/sys_errlist.h> directly; use <stdio.h> instead."
#endif
/* sys_errlist and sys_nerr are deprecated. Use strerror instead. */

5
libio/Makefile
View File

@ -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. # This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
@ -21,7 +21,8 @@
# #
subdir := libio 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 := \ routines := \
filedoalloc iofclose iofdopen iofflush iofgetpos iofgets iofopen \ filedoalloc iofclose iofdopen iofflush iofgetpos iofgets iofopen \

18
libio/stdio.h
View File

@ -1,6 +1,5 @@
/* Define ISO C stdio on top of C++ iostreams. /* Define ISO C stdio on top of C++ iostreams.
Copyright (C) 1991, 1994-1999, 2000, 2001, 2002 Copyright (C) 1991,1994-1999,2000,01,02 Free Software Foundation, Inc.
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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. */ /* Print a message describing the meaning of the value of errno. */
extern void perror (__const char *__s) __THROW; extern void perror (__const char *__s) __THROW;
/* These variables normally should not be used directly. The `strerror' /* Provide the declarations for `sys_errlist' and `sys_nerr' if they
function provides all the needed functionality. */ are available on this system. Even if available, these variables
#ifdef __USE_BSD should not be used directly. The `strerror' function provides
extern int sys_nerr; all the necessary functionality. */
extern __const char *__const sys_errlist[]; #include <bits/sys_errlist.h>
#endif
#ifdef __USE_GNU
extern int _sys_nerr;
extern __const char *__const _sys_errlist[];
#endif
#ifdef __USE_POSIX #ifdef __USE_POSIX

24
sysdeps/generic/bits/sys_errlist.h Normal file
View File

@ -0,0 +1,24 @@
/* Declare sys_errlist and sys_nerr, or don't. Don't version.
Copyright (C) 2002 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
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#ifndef _STDIO_H
# error "Never include <bits/sys_errlist.h> directly; use <stdio.h> instead."
#endif
/* sys_errlist and sys_nerr are deprecated. Use strerror instead. */

33
sysdeps/unix/sysv/linux/bits/sys_errlist.h Normal file
View File

@ -0,0 +1,33 @@
/* Declare sys_errlist and sys_nerr, or don't. Compatibility (do) version.
Copyright (C) 2002 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
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#ifndef _STDIO_H
# error "Never include <bits/sys_errlist.h> directly; use <stdio.h> instead."
#endif
/* sys_errlist and sys_nerr are deprecated. Use strerror instead. */
#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