merge from gcc
This commit is contained in:
parent
6fc1282450
commit
11f6f21d46
3 changed files with 10 additions and 0 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2001-06-11 Loren J. Rittle <ljrittle@acm.org>
|
||||||
|
|
||||||
|
bootstrap/3106
|
||||||
|
* strerror.c (sys_nerr): Hide the OS header version.
|
||||||
|
* strsignal.c (sys_nsig): Likewise.
|
||||||
|
|
||||||
2001-06-10 Richard Henderson <rth@redhat.com>
|
2001-06-10 Richard Henderson <rth@redhat.com>
|
||||||
|
|
||||||
* concat.c: Include string.h. Fix int vs size_t usage.
|
* concat.c: Include string.h. Fix int vs size_t usage.
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
incompatible with our later declaration, perhaps by using const
|
incompatible with our later declaration, perhaps by using const
|
||||||
attributes. So we hide the declaration in errno.h (if any) using a
|
attributes. So we hide the declaration in errno.h (if any) using a
|
||||||
macro. */
|
macro. */
|
||||||
|
#define sys_nerr sys_nerr__
|
||||||
#define sys_errlist sys_errlist__
|
#define sys_errlist sys_errlist__
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -20,6 +21,7 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#ifdef HAVE_SYS_ERRLIST
|
#ifdef HAVE_SYS_ERRLIST
|
||||||
|
#undef sys_nerr
|
||||||
#undef sys_errlist
|
#undef sys_errlist
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
ignore any declaration in the system header files, and always
|
ignore any declaration in the system header files, and always
|
||||||
declare it ourselves. With luck, this will always work. */
|
declare it ourselves. With luck, this will always work. */
|
||||||
#define sys_siglist no_such_symbol
|
#define sys_siglist no_such_symbol
|
||||||
|
#define sys_nsig sys_nsig__no_such_symbol
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
@ -38,6 +39,7 @@ extern PTR memset ();
|
||||||
/* Undefine the macro we used to hide the definition of sys_siglist
|
/* Undefine the macro we used to hide the definition of sys_siglist
|
||||||
found in the system header files. */
|
found in the system header files. */
|
||||||
#undef sys_siglist
|
#undef sys_siglist
|
||||||
|
#undef sys_nsig
|
||||||
|
|
||||||
#ifndef NULL
|
#ifndef NULL
|
||||||
# ifdef __STDC__
|
# ifdef __STDC__
|
||||||
|
|
Loading…
Reference in a new issue