diff options
| author | Daiki Ueno <ueno@gnu.org> | 2015-08-21 10:22:01 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2015-08-21 10:22:01 +0900 |
| commit | 2929cd21f36be2fb4cf1165dd2329a2715f32c87 (patch) | |
| tree | 3969492713e83eb3398d8e49edc135c462968b47 /gettext-runtime | |
| parent | 5cb10fee0bacb6d3cd51f7abda35c4628fddb7f5 (diff) | |
| download | external_gettext-2929cd21f36be2fb4cf1165dd2329a2715f32c87.zip external_gettext-2929cd21f36be2fb4cf1165dd2329a2715f32c87.tar.gz external_gettext-2929cd21f36be2fb4cf1165dd2329a2715f32c87.tar.bz2 | |
intl: Pacify compilation with pre-C99 compilers
* loadmsgcat.c (_nl_load_domain): Move the call to
__libc_lock_define_initialized_recursive to the end of local
variable declarations to avoid extra ';' being expanded to an
empty statement.
Reported by pan7 in:
<http://savannah.gnu.org/support/?108864>.
Diffstat (limited to 'gettext-runtime')
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 10 | ||||
| -rw-r--r-- | gettext-runtime/intl/loadmsgcat.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 5cb5fda..751b65b 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,13 @@ +2015-08-21 Daiki Ueno <ueno@gnu.org> + + intl: Pacify compilation with pre-C99 compilers + * loadmsgcat.c (_nl_load_domain): Move the call to + __libc_lock_define_initialized_recursive to the end of local + variable declarations to avoid extra ';' being expanded to an + empty statement. + Reported by pan7 in: + <http://savannah.gnu.org/support/?108864>. + 2015-07-10 Daiki Ueno <ueno@gnu.org> * gettext 0.19.5 released. diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c index 8eb77d8..3d535ac 100644 --- a/gettext-runtime/intl/loadmsgcat.c +++ b/gettext-runtime/intl/loadmsgcat.c @@ -785,7 +785,6 @@ internal_function _nl_load_domain (struct loaded_l10nfile *domain_file, struct binding *domainbinding) { - __libc_lock_define_initialized_recursive (static, lock); int fd = -1; size_t size; #ifdef _LIBC @@ -799,6 +798,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file, int revision; const char *nullentry; size_t nullentrylen; + __libc_lock_define_initialized_recursive (static, lock); __libc_lock_lock_recursive (lock); if (domain_file->decided != 0) |