diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | include/stdio.h | 2 | ||||
| -rw-r--r-- | libio/iofputs.c | 2 | ||||
| -rw-r--r-- | libio/iofputs_u.c | 6 | ||||
| -rw-r--r-- | misc/syslog.c | 2 |
6 files changed, 21 insertions, 4 deletions
@@ -1,5 +1,16 @@ 2015-06-12 Joseph Myers <joseph@codesourcery.com> + [BZ #18530] + * libio/iofputs.c [!_IO_MTSAFE_IO] (__fputs_unlocked): Define as + strong alias of _IO_fputs. Use libc_hidden_def. + * libio/iofputs_u.c (fputs_unlocked): Rename to __fputs_unlocked + and define as weak alias of __fputs_unlocked. Use + libc_hidden_weak. + * include/stdio.h (__fputs_unlocked): Declare. Use + libc_hidden_proto. + * misc/syslog.c (__vsyslog_chk): Call __fputs_unlocked instead of + fputs_unlocked. + [BZ #18529] * resolv/netdb.h [__USE_POSIX]: Change condition to [__USE_XOPEN2K]. @@ -21,7 +21,7 @@ Version 2.22 18211, 18217, 18220, 18221, 18234, 18244, 18247, 18287, 18319, 18324, 18333, 18346, 18397, 18409, 18410, 18412, 18418, 18422, 18434, 18444, 18468, 18469, 18470, 18479, 18483, 18495, 18496, 18497, 18498, 18507, - 18512, 18519, 18520, 18522, 18527, 18528, 18529. + 18512, 18519, 18520, 18522, 18527, 18528, 18529, 18530. * Cache information can be queried via sysconf() function on s390 e.g. with _SC_LEVEL1_ICACHE_SIZE as argument. diff --git a/include/stdio.h b/include/stdio.h index 489e419..6ae70a3 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -159,6 +159,8 @@ libc_hidden_proto (fgets_unlocked) extern __typeof (fgets_unlocked) __fgets_unlocked; libc_hidden_proto (__fgets_unlocked) libc_hidden_proto (fputs_unlocked) +extern __typeof (fputs_unlocked) __fputs_unlocked; +libc_hidden_proto (__fputs_unlocked) libc_hidden_proto (fmemopen) /* The prototype needs repeating instead of using __typeof to use __THROW in C++ tests. */ diff --git a/libio/iofputs.c b/libio/iofputs.c index 00c1cba..d1e34e4 100644 --- a/libio/iofputs.c +++ b/libio/iofputs.c @@ -48,6 +48,8 @@ libc_hidden_def (_IO_fputs) weak_alias (_IO_fputs, fputs) # ifndef _IO_MTSAFE_IO +strong_alias (_IO_fputs, __fputs_unlocked) +libc_hidden_def (__fputs_unlocked) weak_alias (_IO_fputs, fputs_unlocked) libc_hidden_ver (_IO_fputs, fputs_unlocked) # endif diff --git a/libio/iofputs_u.c b/libio/iofputs_u.c index 6f79838..f823686 100644 --- a/libio/iofputs_u.c +++ b/libio/iofputs_u.c @@ -29,7 +29,7 @@ #include <string.h> int -fputs_unlocked (str, fp) +__fputs_unlocked (str, fp) const char *str; _IO_FILE *fp; { @@ -40,4 +40,6 @@ fputs_unlocked (str, fp) result = 1; return result; } -libc_hidden_def (fputs_unlocked) +libc_hidden_def (__fputs_unlocked) +weak_alias (__fputs_unlocked, fputs_unlocked) +libc_hidden_weak (fputs_unlocked) diff --git a/misc/syslog.c b/misc/syslog.c index 23a4f7b..3979f42 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -202,7 +202,7 @@ __vsyslog_chk(int pri, int flag, const char *fmt, va_list ap) if (LogTag == NULL) LogTag = __progname; if (LogTag != NULL) - fputs_unlocked (LogTag, f); + __fputs_unlocked (LogTag, f); if (LogStat & LOG_PID) fprintf (f, "[%d]", (int) __getpid ()); if (LogTag != NULL) |