diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | include/libc-symbols.h | 4 | ||||
| -rw-r--r-- | include/stdio.h | 4 | ||||
| -rw-r--r-- | sysdeps/gnu/errlist.awk | 6 | ||||
| -rw-r--r-- | sysdeps/gnu/errlist.c | 4 | ||||
| -rw-r--r-- | sysdeps/posix/sigintr.c | 4 | ||||
| -rw-r--r-- | sysdeps/posix/signal.c | 4 |
7 files changed, 23 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index ef9ba52cfa..6811be82c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2002-03-13 Ulrich Drepper <drepper@redhat.com> + * sysdeps/gnu/errlist.awk: Define _sys_errlist_internal and + _sys_nerr_internal with INTVARDEF2. + * include/libc-symbols.h (INTVARDEF2): New macro. + * include/stdio.h (_sys_errlist_internal): Declare as hidden. + (_sys_nerr_internal): Library. + + * sysdeps/posix/signal.c (_sigintr): Define as hidden. + * sysdeps/posix/sigintr.c (_sigintr): Declare as hidden. + * stdio-common/tst-printf.sh: Adjust for last change in tst-printf.c. 2002-03-13 Wolfram Gloger <wg@malloc.de> diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 07badec802..3367c39e09 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -361,16 +361,18 @@ # define INTUSE(name) name##_internal # define INTDEF(name) strong_alias (name, name##_internal) # define INTVARDEF(name) \ - _INTVARDEF(name, name##_internal) + _INTVARDEF (name, name##_internal) # define _INTVARDEF(name, aliasname) \ extern __typeof (name) aliasname __attribute__ ((alias (#name), \ visibility ("hidden"))); # define INTDEF2(name, newname) strong_alias (name, newname##_internal) +# define INTVARDEF2(name, newname) _INTVARDEF (name, newname##_internal) #else # define INTUSE(name) name # define INTDEF(name) # define INTVARDEF(name) # define INTDEF2(name, newname) +# define INTVARDEF2(name, newname) #endif #endif /* libc-symbols.h */ diff --git a/include/stdio.h b/include/stdio.h index 32547b9893..a72d1d741a 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -74,8 +74,8 @@ extern wint_t __getwc_unlocked (FILE *__fp); # endif -extern __const char *__const _sys_errlist_internal[]; -extern int _sys_nerr_internal; +extern __const char *__const _sys_errlist_internal[] attribute_hidden; +extern int _sys_nerr_internal attribute_hidden; # endif diff --git a/sysdeps/gnu/errlist.awk b/sysdeps/gnu/errlist.awk index 07d00c4140..317dc44930 100644 --- a/sysdeps/gnu/errlist.awk +++ b/sysdeps/gnu/errlist.awk @@ -1,4 +1,4 @@ -# Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc. +# Copyright (C) 1991-1999, 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 @@ -106,6 +106,6 @@ END { print "#ifdef SYS_NERR_ALIAS"; print "weak_alias (_sys_nerr, SYS_NERR_ALIAS)"; print "#endif"; - print "INTDEF2(SYS_ERRLIST, _sys_errlist)"; - print "INTDEF2(SYS_NERR, _sys_nerr)"; + print "INTVARDEF2(SYS_ERRLIST, _sys_errlist)"; + print "INTVARDEF2(SYS_NERR, _sys_nerr)"; } diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c index 65b36dd8ae..eec91c757f 100644 --- a/sysdeps/gnu/errlist.c +++ b/sysdeps/gnu/errlist.c @@ -845,5 +845,5 @@ weak_alias (_sys_errlist, SYS_ERRLIST_ALIAS) #ifdef SYS_NERR_ALIAS weak_alias (_sys_nerr, SYS_NERR_ALIAS) #endif -INTDEF2(SYS_ERRLIST, _sys_errlist) -INTDEF2(SYS_NERR, _sys_nerr) +INTVARDEF2(SYS_ERRLIST, _sys_errlist) +INTVARDEF2(SYS_NERR, _sys_nerr) diff --git a/sysdeps/posix/sigintr.c b/sysdeps/posix/sigintr.c index 8a512ced44..ceac262e51 100644 --- a/sysdeps/posix/sigintr.c +++ b/sysdeps/posix/sigintr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1994, 1996, 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 @@ -29,7 +29,7 @@ siginterrupt (sig, interrupt) int interrupt; { #ifdef SA_RESTART - extern sigset_t _sigintr; /* Defined in signal.c. */ + extern sigset_t _sigintr attribute_hidden; /* Defined in signal.c. */ struct sigaction action; if (__sigaction (sig, (struct sigaction *) NULL, &action) < 0) diff --git a/sysdeps/posix/signal.c b/sysdeps/posix/signal.c index 7e74cb376b..9a8efee043 100644 --- a/sysdeps/posix/signal.c +++ b/sysdeps/posix/signal.c @@ -1,5 +1,5 @@ /* BSD-like signal function. - Copyright (C) 1991, 1992, 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1991,1992,1996,1997,2000,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 @@ -21,7 +21,7 @@ #include <signal.h> -sigset_t _sigintr; /* Set by siginterrupt. */ +sigset_t _sigintr attribute_hidden; /* Set by siginterrupt. */ /* Set the handler for the signal SIG to HANDLER, returning the old handler, or SIG_ERR on error. */ |