diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-10-14 23:23:50 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-10-14 23:23:50 +0000 |
| commit | 0e56d268c07233446ac6171d32bf1a5a41fdbea0 (patch) | |
| tree | 123dcc33e35e2dd542724dea3326c7d402a9b1ae /lib/obstack.c | |
| parent | b9e4e1bfc4ba0b133f72e20f23989352d4667085 (diff) | |
| download | gnulib-0e56d268c07233446ac6171d32bf1a5a41fdbea0.tar.gz | |
* config/srclist.txt: Add glibc bug 321 for obstack.c, obstack.h.
* lib/obstack.c [defined _LIBC && defined USE_IN_LIBIO]: Don't
include <wchar.h>; no longer needed.
* lib/obstack.c (print_and_abort) [defined _LIBC]: Use __fxprintf
instead of inline stream orientation test and two separate
function calls. Pay no attention to USE_IN_LIBIO.
* lib/obstack.h [!__STDC__] (obstack_int_grow_fast): Fix misnamed
macro argument.
Reported by Matej Vela <vela@debian.org>.
Diffstat (limited to 'lib/obstack.c')
| -rw-r--r-- | lib/obstack.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/obstack.c b/lib/obstack.c index f3ca2c2e06..6df0611d26 100644 --- a/lib/obstack.c +++ b/lib/obstack.c @@ -51,10 +51,6 @@ # endif #endif -#if defined _LIBC && defined USE_IN_LIBIO -# include <wchar.h> -#endif - #include <stddef.h> #ifndef ELIDE_CODE @@ -433,12 +429,11 @@ print_and_abort (void) happen because the "memory exhausted" message appears in other places like this and the translation should be reused instead of creating a very similar string which requires a separate translation. */ -# if defined _LIBC && defined USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s\n", _("memory exhausted")); - else +# ifdef _LIBC + (void) __fxprintf (NULL, "%s\n", _("memory exhausted")); +# else + fprintf (stderr, "%s\n", _("memory exhausted")); # endif - fprintf (stderr, "%s\n", _("memory exhausted")); exit (obstack_exit_failure); } |