summaryrefslogtreecommitdiff
path: root/gettext-runtime/intl
diff options
context:
space:
mode:
Diffstat (limited to 'gettext-runtime/intl')
-rw-r--r--gettext-runtime/intl/ChangeLog36
-rw-r--r--gettext-runtime/intl/Makefile.in5
-rw-r--r--gettext-runtime/intl/bindtextdom.c28
-rw-r--r--gettext-runtime/intl/dcgettext.c2
-rw-r--r--gettext-runtime/intl/dcigettext.c2
-rw-r--r--gettext-runtime/intl/dcngettext.c2
-rw-r--r--gettext-runtime/intl/dgettext.c2
-rw-r--r--gettext-runtime/intl/dngettext.c2
-rw-r--r--gettext-runtime/intl/eval-plural.h2
-rw-r--r--gettext-runtime/intl/explodename.c2
-rw-r--r--gettext-runtime/intl/finddomain.c2
-rw-r--r--gettext-runtime/intl/gettext.c2
-rw-r--r--gettext-runtime/intl/gettextP.h2
-rw-r--r--gettext-runtime/intl/gmo.h2
-rw-r--r--gettext-runtime/intl/hash-string.c2
-rw-r--r--gettext-runtime/intl/hash-string.h2
-rw-r--r--gettext-runtime/intl/intl-compat.c2
-rw-r--r--gettext-runtime/intl/intl-exports.c2
-rw-r--r--gettext-runtime/intl/l10nflist.c2
-rw-r--r--gettext-runtime/intl/langprefs.c2
-rw-r--r--gettext-runtime/intl/libgnuintl.in.h5
-rw-r--r--gettext-runtime/intl/libintl.glibc3
-rw-r--r--gettext-runtime/intl/loadinfo.h2
-rw-r--r--gettext-runtime/intl/loadmsgcat.c2
-rw-r--r--gettext-runtime/intl/localealias.c2
-rw-r--r--gettext-runtime/intl/localename.c2
-rw-r--r--gettext-runtime/intl/lock.c2
-rw-r--r--gettext-runtime/intl/lock.h2
-rw-r--r--gettext-runtime/intl/log.c2
-rw-r--r--gettext-runtime/intl/ngettext.c2
-rw-r--r--gettext-runtime/intl/os2compat.c2
-rw-r--r--gettext-runtime/intl/os2compat.h2
-rw-r--r--gettext-runtime/intl/osdep.c2
-rw-r--r--gettext-runtime/intl/plural-exp.c6
-rw-r--r--gettext-runtime/intl/plural-exp.h16
-rw-r--r--gettext-runtime/intl/plural.c2
-rw-r--r--gettext-runtime/intl/plural.y2
-rw-r--r--gettext-runtime/intl/printf-args.c2
-rw-r--r--gettext-runtime/intl/printf-args.h2
-rw-r--r--gettext-runtime/intl/printf-parse.c4
-rw-r--r--gettext-runtime/intl/printf-parse.h2
-rw-r--r--gettext-runtime/intl/printf.c2
-rw-r--r--gettext-runtime/intl/ref-add.sin2
-rw-r--r--gettext-runtime/intl/ref-del.sin2
-rw-r--r--gettext-runtime/intl/relocatable.c2
-rw-r--r--gettext-runtime/intl/relocatable.h2
-rw-r--r--gettext-runtime/intl/setlocale.c2
-rw-r--r--gettext-runtime/intl/textdomain.c2
-rw-r--r--gettext-runtime/intl/threadlib.c2
-rw-r--r--gettext-runtime/intl/tsearch.c2
-rw-r--r--gettext-runtime/intl/tsearch.h2
-rw-r--r--gettext-runtime/intl/vasnprintf.c2
-rw-r--r--gettext-runtime/intl/vasnprintf.h2
-rw-r--r--gettext-runtime/intl/vasnwprintf.h2
-rw-r--r--gettext-runtime/intl/verify.h2
-rw-r--r--gettext-runtime/intl/version.c2
-rw-r--r--gettext-runtime/intl/wprintf-parse.h2
-rw-r--r--gettext-runtime/intl/xsize.h2
58 files changed, 137 insertions, 66 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 3fa2ebe..668ac7f 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,39 @@
+2016-06-11 Daiki Ueno <ueno@gnu.org>
+
+ build: Fix unintentional soname bump
+ * gettext-runtime/intl/Makefile.in: Revert LTV_CURRENT and increment
+ LTV_REVISION.
+ * gettext-tools/libgettextpo/Makefile.am: Likewise.
+
+2016-06-09 Daiki Ueno <ueno@gnu.org>
+
+ Prepare for 0.19.8
+
+2016-05-25 Daiki Ueno <ueno@gnu.org>
+
+ intl: Pacify pre-C99 compilers
+ * gettext-runtime/intl/plural-exp.h (HAVE_STRUCT_INITIALIZER): New
+ macro, based on the check previously in plural-exp.c. Also add check
+ for __SUNPRO_C for Solaris Studio C compiler.
+ (GERMANIC_PLURAL): Define as 'struct expression' not 'const struct
+ expression' if struct/union initializers are not supported by the
+ compiler.
+ * gettext-runtime/intl/plural-exp.c: Use HAVE_STRUCT_INITIALIZER.
+ Reported by Dagobert Michelsen and investigated by pan7 in:
+ https://savannah.gnu.org/support/?108743
+
+2016-01-20 KO Myung-Hun <komh78@gmail.com>
+
+ intl: Support UNIXROOT in BINDTEXTDOMAIN () on EMX
+ $UNIXROOT is a drive on which a root of FHS is.
+
+ * gettext-runtime/intl/bindtextdom.c (BINDTEXTDOMAIN): Prepend
+ $UNIXROOT to dirname if it is started '/' or it is an empty string.
+
+2016-01-02 Daiki Ueno <ueno@gnu.org>
+
+ maint: Update copyright year
+
2015-12-28 Daiki Ueno <ueno@gnu.org>
Prepare for 0.19.7
diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index df2aff6..377ca58 100644
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -1,6 +1,5 @@
# Makefile for directory with message catalog handling library of GNU gettext
-# Copyright (C) 1995-1998, 2000-2007, 2009-2015 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2007, 2009-2016 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
@@ -239,7 +238,7 @@ libintl.la libgnuintl.la: $(OBJECTS) $(OBJECTS_RES_@WOE32@)
# Maintainers of other packages that include the intl directory must *not*
# change these values.
LTV_CURRENT=9
-LTV_REVISION=4
+LTV_REVISION=5
LTV_AGE=1
.SUFFIXES:
diff --git a/gettext-runtime/intl/bindtextdom.c b/gettext-runtime/intl/bindtextdom.c
index 887393c..bd82f1a 100644
--- a/gettext-runtime/intl/bindtextdom.c
+++ b/gettext-runtime/intl/bindtextdom.c
@@ -1,5 +1,5 @@
/* Implementation of the bindtextdomain(3) function
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@ -317,7 +317,33 @@ set_binding_values (const char *domainname,
char *
BINDTEXTDOMAIN (const char *domainname, const char *dirname)
{
+#ifdef __EMX__
+ const char *saved_dirname = dirname;
+ char dirname_with_drive[_MAX_PATH];
+
+ /* Resolve UNIXROOT into dirname if it is not resolved by os2compat.[ch]. */
+ if (dirname && (dirname[0] == '/' || dirname[0] == '\\' ))
+ {
+ const char *unixroot = getenv ("UNIXROOT");
+ size_t len = strlen (dirname) + 1;
+
+ if (unixroot
+ && unixroot[0] != '\0'
+ && unixroot[1] == ':'
+ && unixroot[2] == '\0'
+ && 2 + len <= _MAX_PATH)
+ {
+ memcpy (dirname_with_drive, unixroot, 2);
+ memcpy (dirname_with_drive + 2, dirname, len);
+
+ dirname = dirname_with_drive;
+ }
+ }
+#endif
set_binding_values (domainname, &dirname, NULL);
+#ifdef __EMX__
+ dirname = saved_dirname;
+#endif
return (char *) dirname;
}
diff --git a/gettext-runtime/intl/dcgettext.c b/gettext-runtime/intl/dcgettext.c
index da7cc35..e110537 100644
--- a/gettext-runtime/intl/dcgettext.c
+++ b/gettext-runtime/intl/dcgettext.c
@@ -1,5 +1,5 @@
/* Implementation of the dcgettext(3) function.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index c0faf18..83bd775 100644
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -1,5 +1,5 @@
/* Implementation of the internal dcigettext function.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/dcngettext.c b/gettext-runtime/intl/dcngettext.c
index f49d04a..2e5be1f 100644
--- a/gettext-runtime/intl/dcngettext.c
+++ b/gettext-runtime/intl/dcngettext.c
@@ -1,5 +1,5 @@
/* Implementation of the dcngettext(3) function.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/dgettext.c b/gettext-runtime/intl/dgettext.c
index aba0b26..44aa2c3 100644
--- a/gettext-runtime/intl/dgettext.c
+++ b/gettext-runtime/intl/dgettext.c
@@ -1,5 +1,5 @@
/* Implementation of the dgettext(3) function.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/dngettext.c b/gettext-runtime/intl/dngettext.c
index 53d5248..4b1986c 100644
--- a/gettext-runtime/intl/dngettext.c
+++ b/gettext-runtime/intl/dngettext.c
@@ -1,5 +1,5 @@
/* Implementation of the dngettext(3) function.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/eval-plural.h b/gettext-runtime/intl/eval-plural.h
index 52ec801..7435860 100644
--- a/gettext-runtime/intl/eval-plural.h
+++ b/gettext-runtime/intl/eval-plural.h
@@ -1,5 +1,5 @@
/* Plural expression evaluation.
- Copyright (C) 2000-2003, 2007, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003, 2007, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/explodename.c b/gettext-runtime/intl/explodename.c
index 83feef3..43d1ec4 100644
--- a/gettext-runtime/intl/explodename.c
+++ b/gettext-runtime/intl/explodename.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/finddomain.c b/gettext-runtime/intl/finddomain.c
index a5c157f..b9c5a1f 100644
--- a/gettext-runtime/intl/finddomain.c
+++ b/gettext-runtime/intl/finddomain.c
@@ -1,5 +1,5 @@
/* Handle list of needed message catalogs
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@gnu.org>, 1995.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/gettext.c b/gettext-runtime/intl/gettext.c
index 3aada55..e2c4675 100644
--- a/gettext-runtime/intl/gettext.c
+++ b/gettext-runtime/intl/gettext.c
@@ -1,5 +1,5 @@
/* Implementation of gettext(3) function.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h
index f3a9ded..52be2fc 100644
--- a/gettext-runtime/intl/gettextP.h
+++ b/gettext-runtime/intl/gettextP.h
@@ -1,5 +1,5 @@
/* Header describing internals of libintl library.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/gmo.h b/gettext-runtime/intl/gmo.h
index 4197765..028cac9 100644
--- a/gettext-runtime/intl/gmo.h
+++ b/gettext-runtime/intl/gmo.h
@@ -1,5 +1,5 @@
/* Description of GNU message catalog format: general file layout.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/hash-string.c b/gettext-runtime/intl/hash-string.c
index 7442065..4827cc0 100644
--- a/gettext-runtime/intl/hash-string.c
+++ b/gettext-runtime/intl/hash-string.c
@@ -1,5 +1,5 @@
/* Implements a string hashing function.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
diff --git a/gettext-runtime/intl/hash-string.h b/gettext-runtime/intl/hash-string.h
index be8b78c..473d770 100644
--- a/gettext-runtime/intl/hash-string.h
+++ b/gettext-runtime/intl/hash-string.h
@@ -1,5 +1,5 @@
/* Description of GNU message catalog format: string hashing function.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/intl-compat.c b/gettext-runtime/intl/intl-compat.c
index ee933d7..fb2f64c 100644
--- a/gettext-runtime/intl/intl-compat.c
+++ b/gettext-runtime/intl/intl-compat.c
@@ -1,6 +1,6 @@
/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
Library.
- Copyright (C) 1995, 2000-2003, 2005, 2015 Free Software Foundation,
+ Copyright (C) 1995, 2000-2003, 2005, 2015-2016 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/intl-exports.c b/gettext-runtime/intl/intl-exports.c
index 48b05be..d480ef3 100644
--- a/gettext-runtime/intl/intl-exports.c
+++ b/gettext-runtime/intl/intl-exports.c
@@ -1,5 +1,5 @@
/* List of exported symbols of libintl on Cygwin.
- Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2006.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/l10nflist.c b/gettext-runtime/intl/l10nflist.c
index 8d215e3..7e52b13 100644
--- a/gettext-runtime/intl/l10nflist.c
+++ b/gettext-runtime/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/langprefs.c b/gettext-runtime/intl/langprefs.c
index fb7469f..c04b7a3 100644
--- a/gettext-runtime/intl/langprefs.c
+++ b/gettext-runtime/intl/langprefs.c
@@ -1,5 +1,5 @@
/* Determine the user's language preferences.
- Copyright (C) 2004-2007, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2004-2007, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h
index 9347f9a..dc1947f 100644
--- a/gettext-runtime/intl/libgnuintl.in.h
+++ b/gettext-runtime/intl/libgnuintl.in.h
@@ -1,6 +1,5 @@
/* Message catalogs for internationalization.
- Copyright (C) 1995-1997, 2000-2015 Free Software Foundation,
- Inc.
+ Copyright (C) 1995-1997, 2000-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@ -55,7 +54,7 @@ extern "C" {
/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x001307
+#define LIBINTL_VERSION 0x001308
extern int libintl_version;
diff --git a/gettext-runtime/intl/libintl.glibc b/gettext-runtime/intl/libintl.glibc
index f0570be..e81c8bb 100644
--- a/gettext-runtime/intl/libintl.glibc
+++ b/gettext-runtime/intl/libintl.glibc
@@ -1,6 +1,5 @@
/* Message catalogs for internationalization.
- Copyright (C) 1995-2002, 2004-2005, 2015 Free Software Foundation,
- Inc.
+ Copyright (C) 1995-2002, 2004-2005, 2015-2016 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This file is derived from the file libgettext.h in the GNU gettext package.
diff --git a/gettext-runtime/intl/loadinfo.h b/gettext-runtime/intl/loadinfo.h
index 91ab556..2e15f93 100644
--- a/gettext-runtime/intl/loadinfo.h
+++ b/gettext-runtime/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c
index 268e1bf..7dadda1 100644
--- a/gettext-runtime/intl/loadmsgcat.c
+++ b/gettext-runtime/intl/loadmsgcat.c
@@ -1,5 +1,5 @@
/* Load needed message catalogs.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/localealias.c b/gettext-runtime/intl/localealias.c
index 3a4d094..f64f8ca 100644
--- a/gettext-runtime/intl/localealias.c
+++ b/gettext-runtime/intl/localealias.c
@@ -1,5 +1,5 @@
/* Handle aliases for locale names.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
index c27be86..81ab213 100644
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -1,5 +1,5 @@
/* Determine name of the currently selected locale.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/lock.c b/gettext-runtime/intl/lock.c
index 6ea32c5..69d624d 100644
--- a/gettext-runtime/intl/lock.c
+++ b/gettext-runtime/intl/lock.c
@@ -1,5 +1,5 @@
/* Locking in multithreaded situations.
- Copyright (C) 2005-2008, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2008, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/lock.h b/gettext-runtime/intl/lock.h
index 26d53ad..6b173f8 100644
--- a/gettext-runtime/intl/lock.h
+++ b/gettext-runtime/intl/lock.h
@@ -1,5 +1,5 @@
/* Locking in multithreaded situations.
- Copyright (C) 2005-2008, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2008, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/log.c b/gettext-runtime/intl/log.c
index 48e9b6b..d17ab5e 100644
--- a/gettext-runtime/intl/log.c
+++ b/gettext-runtime/intl/log.c
@@ -1,5 +1,5 @@
/* Log file output.
- Copyright (C) 2003, 2005, 2009, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2009, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/ngettext.c b/gettext-runtime/intl/ngettext.c
index 6fdb5e4..908c225 100644
--- a/gettext-runtime/intl/ngettext.c
+++ b/gettext-runtime/intl/ngettext.c
@@ -1,5 +1,5 @@
/* Implementation of ngettext(3) function.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/os2compat.c b/gettext-runtime/intl/os2compat.c
index 2d9e1a6..6d94359 100644
--- a/gettext-runtime/intl/os2compat.c
+++ b/gettext-runtime/intl/os2compat.c
@@ -1,5 +1,5 @@
/* OS/2 compatibility functions.
- Copyright (C) 2001-2002, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/os2compat.h b/gettext-runtime/intl/os2compat.h
index 281223b..d92ecbe 100644
--- a/gettext-runtime/intl/os2compat.h
+++ b/gettext-runtime/intl/os2compat.h
@@ -1,6 +1,6 @@
/* OS/2 compatibility defines.
This file is intended to be included from config.h
- Copyright (C) 2001-2002, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/osdep.c b/gettext-runtime/intl/osdep.c
index eda9d28..77443a8 100644
--- a/gettext-runtime/intl/osdep.c
+++ b/gettext-runtime/intl/osdep.c
@@ -1,5 +1,5 @@
/* OS dependent parts of libintl.
- Copyright (C) 2001-2002, 2006, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2006, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/plural-exp.c b/gettext-runtime/intl/plural-exp.c
index d483853..b1445ff 100644
--- a/gettext-runtime/intl/plural-exp.c
+++ b/gettext-runtime/intl/plural-exp.c
@@ -1,5 +1,5 @@
/* Expression parsing for plural form selection.
- Copyright (C) 2000-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000-2016 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
This program is free software: you can redistribute it and/or modify
@@ -25,9 +25,7 @@
#include "plural-exp.h"
-#if (defined __GNUC__ && !(defined __APPLE_CC_ && __APPLE_CC__ > 1) \
- && !defined __cplusplus) \
- || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+#if HAVE_STRUCT_INITIALIZER
/* These structs are the constant expression for the germanic plural
form determination. It represents the expression "n != 1". */
diff --git a/gettext-runtime/intl/plural-exp.h b/gettext-runtime/intl/plural-exp.h
index 32edbc0..6278b95 100644
--- a/gettext-runtime/intl/plural-exp.h
+++ b/gettext-runtime/intl/plural-exp.h
@@ -1,5 +1,5 @@
/* Expression parsing and evaluation for plural form selection.
- Copyright (C) 2000-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000-2016 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
This program is free software: you can redistribute it and/or modify
@@ -105,10 +105,24 @@ struct parse_args
# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
#endif
+#if (defined __GNUC__ && !(defined __APPLE_CC_ && __APPLE_CC__ > 1) \
+ && !defined __cplusplus) \
+ || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) \
+ || (defined __SUNPRO_C && 0x560 <= __SUNPRO_C \
+ && !(defined __STDC__ && __STDC__ == 1))
+# define HAVE_STRUCT_INITIALIZER 1
+#else
+# define HAVE_STRUCT_INITIALIZER 0
+#endif
+
extern void FREE_EXPRESSION (struct expression *exp)
internal_function;
extern int PLURAL_PARSE (struct parse_args *arg);
+#if HAVE_STRUCT_INITIALIZER
extern const struct expression GERMANIC_PLURAL attribute_hidden;
+#else
+extern struct expression GERMANIC_PLURAL attribute_hidden;
+#endif
extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
const struct expression **pluralp,
unsigned long int *npluralsp)
diff --git a/gettext-runtime/intl/plural.c b/gettext-runtime/intl/plural.c
index 86b2583..114245a 100644
--- a/gettext-runtime/intl/plural.c
+++ b/gettext-runtime/intl/plural.c
@@ -71,7 +71,7 @@
#line 1 "plural.y" /* yacc.c:339 */
/* Expression parsing for plural form selection.
- Copyright (C) 2000-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000-2016 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/plural.y b/gettext-runtime/intl/plural.y
index 7ff11d9..b9e10ef 100644
--- a/gettext-runtime/intl/plural.y
+++ b/gettext-runtime/intl/plural.y
@@ -1,6 +1,6 @@
%{
/* Expression parsing for plural form selection.
- Copyright (C) 2000-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000-2016 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/printf-args.c b/gettext-runtime/intl/printf-args.c
index 3c34867..6522526 100644
--- a/gettext-runtime/intl/printf-args.c
+++ b/gettext-runtime/intl/printf-args.c
@@ -1,5 +1,5 @@
/* Decomposed printf argument list.
- Copyright (C) 1999, 2002-2003, 2005-2007, 2015 Free Software
+ Copyright (C) 1999, 2002-2003, 2005-2007, 2015-2016 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/printf-args.h b/gettext-runtime/intl/printf-args.h
index 0937e60..946328b 100644
--- a/gettext-runtime/intl/printf-args.h
+++ b/gettext-runtime/intl/printf-args.h
@@ -1,5 +1,5 @@
/* Decomposed printf argument list.
- Copyright (C) 1999, 2002-2003, 2006-2007, 2011, 2015 Free Software
+ Copyright (C) 1999, 2002-2003, 2006-2007, 2011, 2015-2016 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/printf-parse.c b/gettext-runtime/intl/printf-parse.c
index 87f49a3..ebcb484 100644
--- a/gettext-runtime/intl/printf-parse.c
+++ b/gettext-runtime/intl/printf-parse.c
@@ -1,6 +1,6 @@
/* Formatted output to strings.
- Copyright (C) 1999-2000, 2002-2003, 2006-2008, 2011, 2015 Free
- Software Foundation, Inc.
+ Copyright (C) 1999-2000, 2002-2003, 2006-2008, 2011, 2015-2016 Free Software
+ Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/printf-parse.h b/gettext-runtime/intl/printf-parse.h
index b90233e..547d9d0 100644
--- a/gettext-runtime/intl/printf-parse.h
+++ b/gettext-runtime/intl/printf-parse.h
@@ -1,5 +1,5 @@
/* Parse printf format string.
- Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011, 2015 Free
+ Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011, 2015-2016 Free
Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/printf.c b/gettext-runtime/intl/printf.c
index 35c0fa0..7e6bebd 100644
--- a/gettext-runtime/intl/printf.c
+++ b/gettext-runtime/intl/printf.c
@@ -1,5 +1,5 @@
/* Formatted output to strings, using POSIX/XSI format strings with positions.
- Copyright (C) 2003, 2006-2007, 2009-2011, 2015 Free Software
+ Copyright (C) 2003, 2006-2007, 2009-2011, 2015-2016 Free Software
Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2003.
diff --git a/gettext-runtime/intl/ref-add.sin b/gettext-runtime/intl/ref-add.sin
index 19cf2b0..189b614 100644
--- a/gettext-runtime/intl/ref-add.sin
+++ b/gettext-runtime/intl/ref-add.sin
@@ -1,6 +1,6 @@
# Add this package to a list of references stored in a text file.
#
-# Copyright (C) 2000, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2015-2016 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/ref-del.sin b/gettext-runtime/intl/ref-del.sin
index a29f509..5e36932 100644
--- a/gettext-runtime/intl/ref-del.sin
+++ b/gettext-runtime/intl/ref-del.sin
@@ -1,6 +1,6 @@
# Remove this package from a list of references stored in a text file.
#
-# Copyright (C) 2000, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2015-2016 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/relocatable.c b/gettext-runtime/intl/relocatable.c
index 66532b4..60cb54a 100644
--- a/gettext-runtime/intl/relocatable.c
+++ b/gettext-runtime/intl/relocatable.c
@@ -1,5 +1,5 @@
/* Provide relocatable packages.
- Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003-2006, 2008-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2003.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/relocatable.h b/gettext-runtime/intl/relocatable.h
index 8ee49f3..ecad3a7 100644
--- a/gettext-runtime/intl/relocatable.h
+++ b/gettext-runtime/intl/relocatable.h
@@ -1,5 +1,5 @@
/* Provide relocatable packages.
- Copyright (C) 2003, 2005, 2008, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2008, 2015-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2003.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/setlocale.c b/gettext-runtime/intl/setlocale.c
index 9c4cf11..07c2305 100644
--- a/gettext-runtime/intl/setlocale.c
+++ b/gettext-runtime/intl/setlocale.c
@@ -1,5 +1,5 @@
/* setlocale() function that respects the locale chosen by the user.
- Copyright (C) 2009, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2015-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2009.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/textdomain.c b/gettext-runtime/intl/textdomain.c
index 7ccf68e..4784b3e 100644
--- a/gettext-runtime/intl/textdomain.c
+++ b/gettext-runtime/intl/textdomain.c
@@ -1,5 +1,5 @@
/* Implementation of the textdomain(3) function.
- Copyright (C) 1995-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/threadlib.c b/gettext-runtime/intl/threadlib.c
index 11363a8..90f0dbe 100644
--- a/gettext-runtime/intl/threadlib.c
+++ b/gettext-runtime/intl/threadlib.c
@@ -1,5 +1,5 @@
/* Multithreading primitives.
- Copyright (C) 2005-2009, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2009, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/tsearch.c b/gettext-runtime/intl/tsearch.c
index a7c51c2..e3cdcaf 100644
--- a/gettext-runtime/intl/tsearch.c
+++ b/gettext-runtime/intl/tsearch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1997, 2000, 2006, 2015 Free Software Foundation,
+/* Copyright (C) 1995-1997, 2000, 2006, 2015-2016 Free Software Foundation,
Inc.
Contributed by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>, 1997.
diff --git a/gettext-runtime/intl/tsearch.h b/gettext-runtime/intl/tsearch.h
index 71263cd..243eca6 100644
--- a/gettext-runtime/intl/tsearch.h
+++ b/gettext-runtime/intl/tsearch.h
@@ -1,5 +1,5 @@
/* Binary tree data structure.
- Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c
index fabdc17..236bfe5 100644
--- a/gettext-runtime/intl/vasnprintf.c
+++ b/gettext-runtime/intl/vasnprintf.c
@@ -1,5 +1,5 @@
/* vsprintf with automatic memory allocation.
- Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/vasnprintf.h b/gettext-runtime/intl/vasnprintf.h
index 2594015..5a2bbfc 100644
--- a/gettext-runtime/intl/vasnprintf.h
+++ b/gettext-runtime/intl/vasnprintf.h
@@ -1,5 +1,5 @@
/* vsprintf with automatic memory allocation.
- Copyright (C) 2002-2004, 2012, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2002-2004, 2012, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/vasnwprintf.h b/gettext-runtime/intl/vasnwprintf.h
index 584b331..aeb69d2 100644
--- a/gettext-runtime/intl/vasnwprintf.h
+++ b/gettext-runtime/intl/vasnwprintf.h
@@ -1,5 +1,5 @@
/* vswprintf with automatic memory allocation.
- Copyright (C) 2002-2003, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/verify.h b/gettext-runtime/intl/verify.h
index 4784fb3..267de29 100644
--- a/gettext-runtime/intl/verify.h
+++ b/gettext-runtime/intl/verify.h
@@ -1,6 +1,6 @@
/* Compile-time assert-like macros.
- Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/version.c b/gettext-runtime/intl/version.c
index 22f6f77..4070c1f 100644
--- a/gettext-runtime/intl/version.c
+++ b/gettext-runtime/intl/version.c
@@ -1,5 +1,5 @@
/* libintl library version.
- Copyright (C) 2005, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2015-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/wprintf-parse.h b/gettext-runtime/intl/wprintf-parse.h
index 514145a..73d828c 100644
--- a/gettext-runtime/intl/wprintf-parse.h
+++ b/gettext-runtime/intl/wprintf-parse.h
@@ -1,5 +1,5 @@
/* Parse printf format string.
- Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011, 2015 Free
+ Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011, 2015-2016 Free
Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/xsize.h b/gettext-runtime/intl/xsize.h
index de3d92e..c82712d 100644
--- a/gettext-runtime/intl/xsize.h
+++ b/gettext-runtime/intl/xsize.h
@@ -1,6 +1,6 @@
/* xsize.h -- Checked size_t computations.
- Copyright (C) 2003, 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2008-2016 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by