diff options
| author | Bruno Haible <bruno@clisp.org> | 2006-07-22 15:52:26 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:13:40 +0200 |
| commit | 302ce3ec4b8fe53678b8f8dddffe0e196652d5e7 (patch) | |
| tree | 9a561e8204ea143013702b0cd86be09525c12c8c /gettext-tools | |
| parent | a1edcdfa6fe3511aa3d32414868c7797ccc05795 (diff) | |
| download | external_gettext-302ce3ec4b8fe53678b8f8dddffe0e196652d5e7.zip external_gettext-302ce3ec4b8fe53678b8f8dddffe0e196652d5e7.tar.gz external_gettext-302ce3ec4b8fe53678b8f8dddffe0e196652d5e7.tar.bz2 | |
Update from gnulib.
Diffstat (limited to 'gettext-tools')
| -rw-r--r-- | gettext-tools/lib/obstack.c | 13 | ||||
| -rw-r--r-- | gettext-tools/lib/obstack.h | 11 |
2 files changed, 7 insertions, 17 deletions
diff --git a/gettext-tools/lib/obstack.c b/gettext-tools/lib/obstack.c index 5a6dd79..f84e6d0 100644 --- a/gettext-tools/lib/obstack.c +++ b/gettext-tools/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); } diff --git a/gettext-tools/lib/obstack.h b/gettext-tools/lib/obstack.h index 687d43e..63857fd 100644 --- a/gettext-tools/lib/obstack.h +++ b/gettext-tools/lib/obstack.h @@ -1,11 +1,6 @@ /* obstack.h - object stack macros - Copyright (C) 1988-1994, 1996-1999, 2003-2004 Free Software Foundation, Inc. - - This file is part of the GNU C Library. Its master source is NOT part of - the C library, however. The master source lives in /gd/gnu/lib. - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@gnu.org. + Copyright (C) 1988-1994, 1996-1999, 2003-2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -464,7 +459,7 @@ __extension__ \ (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr)) # define obstack_int_grow_fast(h,aint) \ - (((int *) ((h)->next_free += sizeof (int)))[-1] = (aptr)) + (((int *) ((h)->next_free += sizeof (int)))[-1] = (aint)) # define obstack_blank(h,length) \ ( (h)->temp.tempint = (length), \ |