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.
This commit is contained in:
parent
4975f0c3d0
commit
3a67e81d75
|
@ -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>
|
2018-11-29 Mao Han <han_mao@c-sky.com>
|
||||||
|
|
||||||
* elf/elf.h (EM_CSKY, R_CKCORE_NONE, R_CKCORE_ADDR32)
|
* elf/elf.h (EM_CSKY, R_CKCORE_NONE, R_CKCORE_ADDR32)
|
||||||
|
|
|
@ -149,9 +149,11 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
|
||||||
size_t i;
|
size_t i;
|
||||||
for (i = 0; i < pad; i++)
|
for (i = 0; i < pad; i++)
|
||||||
{
|
{
|
||||||
|
#ifdef _LIBC
|
||||||
if (_IO_fwide (fs->stream, 0) > 0)
|
if (_IO_fwide (fs->stream, 0) > 0)
|
||||||
putwc_unlocked (L' ', fs->stream);
|
putwc_unlocked (L' ', fs->stream);
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
putc_unlocked (' ', fs->stream);
|
putc_unlocked (' ', fs->stream);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -312,9 +314,11 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
|
||||||
*nl++ = ' ';
|
*nl++ = ' ';
|
||||||
else
|
else
|
||||||
for (i = 0; i < fs->wmargin; ++i)
|
for (i = 0; i < fs->wmargin; ++i)
|
||||||
|
#ifdef _LIBC
|
||||||
if (_IO_fwide (fs->stream, 0) > 0)
|
if (_IO_fwide (fs->stream, 0) > 0)
|
||||||
putwc_unlocked (L' ', fs->stream);
|
putwc_unlocked (L' ', fs->stream);
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
putc_unlocked (' ', fs->stream);
|
putc_unlocked (' ', fs->stream);
|
||||||
|
|
||||||
/* Copy the tail of the original buffer into the current buffer
|
/* Copy the tail of the original buffer into the current buffer
|
||||||
|
|
|
@ -1873,9 +1873,11 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef _LIBC
|
||||||
if (_IO_fwide (stream, 0) > 0)
|
if (_IO_fwide (stream, 0) > 0)
|
||||||
putwc_unlocked (L'\n', stream);
|
putwc_unlocked (L'\n', stream);
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
putc_unlocked ('\n', stream);
|
putc_unlocked ('\n', stream);
|
||||||
|
|
||||||
#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
|
#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
|
||||||
|
|
Loading…
Reference in a new issue