diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-07-03 17:43:09 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-07-03 17:43:32 +0900 |
| commit | b1ded6a9229c9be19836002dd5d92d610bee56dc (patch) | |
| tree | 972700576708b6cc26728aedfc64cc0dba2fa092 /gettext-runtime/intl | |
| parent | b0ca3de6f10adee0f4ec3a837ecf470a72f4f6f0 (diff) | |
| download | external_gettext-b1ded6a9229c9be19836002dd5d92d610bee56dc.zip external_gettext-b1ded6a9229c9be19836002dd5d92d610bee56dc.tar.gz external_gettext-b1ded6a9229c9be19836002dd5d92d610bee56dc.tar.bz2 | |
intl: Sync up loadmsgcat.c with glibc
* loadmsgcat.c [_LIBC]: Define PRI_MACROS_BROKEN unconditionally.
Diffstat (limited to 'gettext-runtime/intl')
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/intl/loadmsgcat.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index b786697..ce90702 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,6 +1,11 @@ 2014-07-03 Siddhesh Poyarekar <siddhesh@redhat.com> intl: Sync up loadmsgcat.c with glibc + * loadmsgcat.c [_LIBC]: Define PRI_MACROS_BROKEN unconditionally. + +2014-07-03 Siddhesh Poyarekar <siddhesh@redhat.com> + + intl: Sync up loadmsgcat.c with glibc * loadmsgcat.c: Include assert.h. (_nl_load_domain): Add semicolon to end of line. (_nl_load_domain)[HAVE_MMAP]: Use MAP_FAILED and assert that diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c index 826a5ed..570f476 100644 --- a/gettext-runtime/intl/loadmsgcat.c +++ b/gettext-runtime/intl/loadmsgcat.c @@ -101,9 +101,7 @@ char *alloca (); #endif #ifdef _LIBC -# ifndef PRI_MACROS_BROKEN -# define PRI_MACROS_BROKEN 0 -# endif +# define PRI_MACROS_BROKEN 0 #endif /* Provide fallback values for macros that ought to be defined in <inttypes.h>. |