diff options
| author | Charles-Antoine Couret <charles-antoine.couret@essensium.com> | 2018-11-29 17:56:55 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2018-11-29 17:56:55 +0000 |
| commit | 3a67e81d7527363a96af095a5af03b6201b82e9d (patch) | |
| tree | d9bf1888085845dba749047c639977b4ce28f8b8 | |
| parent | 4975f0c3d0131fdf697be0b1631c265e5fd39088 (diff) | |
| download | glibc-3a67e81d7527363a96af095a5af03b6201b82e9d.tar.gz | |
argp: do not call _IO_fwide() if _LIBC is not defined
_IO_fwide() is defined in libio.h file. This file is included only
when _LIBC is defined.
So, in case of compilation of these files without _LIBC definition,
the compilation failed due to this unknown function.
Now this function is called when libio.h file is included.
(Change merged from gnulib. Tested on x86_64.)
* argp/argp-fmtstream.c (__argp_fmtstream_update): Use [_LIBC]
conditional on calls to _IO_fwide and putwc_unlocked. (Merge from
gnulib.)
* argp/argp-help.c (__argp_failure): Likewise.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | argp/argp-fmtstream.c | 4 | ||||
| -rw-r--r-- | argp/argp-help.c | 2 |
3 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2018-11-29 Charles-Antoine Couret <charles-antoine.couret@essensium.com> + + * argp/argp-fmtstream.c (__argp_fmtstream_update): Use [_LIBC] + conditional on calls to _IO_fwide and putwc_unlocked. (Merge from + gnulib.) + * argp/argp-help.c (__argp_failure): Likewise. + 2018-11-29 Mao Han <han_mao@c-sky.com> * elf/elf.h (EM_CSKY, R_CKCORE_NONE, R_CKCORE_ADDR32) diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c index e43a0c7cf1..e9e4c0e5cc 100644 --- a/argp/argp-fmtstream.c +++ b/argp/argp-fmtstream.c @@ -149,9 +149,11 @@ __argp_fmtstream_update (argp_fmtstream_t fs) size_t i; for (i = 0; i < pad; i++) { +#ifdef _LIBC if (_IO_fwide (fs->stream, 0) > 0) putwc_unlocked (L' ', fs->stream); else +#endif putc_unlocked (' ', fs->stream); } } @@ -312,9 +314,11 @@ __argp_fmtstream_update (argp_fmtstream_t fs) *nl++ = ' '; else for (i = 0; i < fs->wmargin; ++i) +#ifdef _LIBC if (_IO_fwide (fs->stream, 0) > 0) putwc_unlocked (L' ', fs->stream); else +#endif putc_unlocked (' ', fs->stream); /* Copy the tail of the original buffer into the current buffer diff --git a/argp/argp-help.c b/argp/argp-help.c index 2b6b0775d6..a17260378c 100644 --- a/argp/argp-help.c +++ b/argp/argp-help.c @@ -1873,9 +1873,11 @@ __argp_failure (const struct argp_state *state, int status, int errnum, #endif } +#ifdef _LIBC if (_IO_fwide (stream, 0) > 0) putwc_unlocked (L'\n', stream); else +#endif putc_unlocked ('\n', stream); #if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE) |