summaryrefslogtreecommitdiff
path: root/gettext-runtime/gnulib-lib
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@lorry>2016-06-11 13:13:21 +0000
committerLorry Tar Creator <lorry-tar-importer@lorry>2016-06-11 13:13:21 +0000
commit500500ec9b7b0d0cef90b48c9b4ddc8866b5f19c (patch)
tree1d7b3e6fab5c199fdbbaab53ee9532de6a4c8cf7 /gettext-runtime/gnulib-lib
parent6eb5949dd99d174393465069c2fd0bab32deddcc (diff)
downloadgettext-tarball-500500ec9b7b0d0cef90b48c9b4ddc8866b5f19c.tar.gz
Diffstat (limited to 'gettext-runtime/gnulib-lib')
-rw-r--r--gettext-runtime/gnulib-lib/Makefile.am10
-rw-r--r--gettext-runtime/gnulib-lib/Makefile.in35
-rw-r--r--gettext-runtime/gnulib-lib/alloca.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/allocator.h2
-rw-r--r--gettext-runtime/gnulib-lib/areadlink.c2
-rw-r--r--gettext-runtime/gnulib-lib/areadlink.h2
-rw-r--r--gettext-runtime/gnulib-lib/basename.c2
-rw-r--r--gettext-runtime/gnulib-lib/basename.h2
-rw-r--r--gettext-runtime/gnulib-lib/c-ctype.h2
-rw-r--r--gettext-runtime/gnulib-lib/c-strcase.h2
-rw-r--r--gettext-runtime/gnulib-lib/c-strcasecmp.c2
-rw-r--r--gettext-runtime/gnulib-lib/c-strncasecmp.c2
-rw-r--r--gettext-runtime/gnulib-lib/canonicalize-lgpl.c2
-rw-r--r--gettext-runtime/gnulib-lib/careadlinkat.c2
-rw-r--r--gettext-runtime/gnulib-lib/careadlinkat.h2
-rw-r--r--gettext-runtime/gnulib-lib/closeout.c2
-rw-r--r--gettext-runtime/gnulib-lib/closeout.h2
-rw-r--r--gettext-runtime/gnulib-lib/config.charset2
-rw-r--r--gettext-runtime/gnulib-lib/dosname.h2
-rw-r--r--gettext-runtime/gnulib-lib/errno.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/error.c2
-rw-r--r--gettext-runtime/gnulib-lib/error.h2
-rw-r--r--gettext-runtime/gnulib-lib/fwriteerror.c2
-rw-r--r--gettext-runtime/gnulib-lib/fwriteerror.h2
-rw-r--r--gettext-runtime/gnulib-lib/getopt.c2
-rw-r--r--gettext-runtime/gnulib-lib/getopt.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/getopt1.c2
-rw-r--r--gettext-runtime/gnulib-lib/getopt_int.h2
-rw-r--r--gettext-runtime/gnulib-lib/gettext.h12
-rw-r--r--gettext-runtime/gnulib-lib/gettimeofday.c2
-rw-r--r--gettext-runtime/gnulib-lib/glthread/lock.c2
-rw-r--r--gettext-runtime/gnulib-lib/glthread/lock.h2
-rw-r--r--gettext-runtime/gnulib-lib/glthread/threadlib.c2
-rw-r--r--gettext-runtime/gnulib-lib/hard-locale.c72
-rw-r--r--gettext-runtime/gnulib-lib/hard-locale.h25
-rw-r--r--gettext-runtime/gnulib-lib/iconv.c2
-rw-r--r--gettext-runtime/gnulib-lib/iconv.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/iconv_close.c2
-rw-r--r--gettext-runtime/gnulib-lib/iconv_open.c2
-rw-r--r--gettext-runtime/gnulib-lib/intprops.h53
-rw-r--r--gettext-runtime/gnulib-lib/iswblank.c2
-rw-r--r--gettext-runtime/gnulib-lib/langinfo.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/localcharset.c2
-rw-r--r--gettext-runtime/gnulib-lib/localcharset.h2
-rw-r--r--gettext-runtime/gnulib-lib/locale.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/localename.c2
-rw-r--r--gettext-runtime/gnulib-lib/localename.h2
-rw-r--r--gettext-runtime/gnulib-lib/lstat.c2
-rw-r--r--gettext-runtime/gnulib-lib/malloca.c2
-rw-r--r--gettext-runtime/gnulib-lib/malloca.h2
-rw-r--r--gettext-runtime/gnulib-lib/mbchar.c2
-rw-r--r--gettext-runtime/gnulib-lib/mbchar.h2
-rw-r--r--gettext-runtime/gnulib-lib/mbiter.h2
-rw-r--r--gettext-runtime/gnulib-lib/mbrtowc.c56
-rw-r--r--gettext-runtime/gnulib-lib/mbsinit.c2
-rw-r--r--gettext-runtime/gnulib-lib/mbslen.c2
-rw-r--r--gettext-runtime/gnulib-lib/mbsstr.c2
-rw-r--r--gettext-runtime/gnulib-lib/mbuiter.h2
-rw-r--r--gettext-runtime/gnulib-lib/memchr.c2
-rw-r--r--gettext-runtime/gnulib-lib/msvc-inval.c2
-rw-r--r--gettext-runtime/gnulib-lib/msvc-inval.h2
-rw-r--r--gettext-runtime/gnulib-lib/msvc-nothrow.c2
-rw-r--r--gettext-runtime/gnulib-lib/msvc-nothrow.h2
-rw-r--r--gettext-runtime/gnulib-lib/pathmax.h2
-rw-r--r--gettext-runtime/gnulib-lib/progname.c2
-rw-r--r--gettext-runtime/gnulib-lib/progname.h2
-rw-r--r--gettext-runtime/gnulib-lib/progreloc.c2
-rw-r--r--gettext-runtime/gnulib-lib/propername.c2
-rw-r--r--gettext-runtime/gnulib-lib/propername.h2
-rw-r--r--gettext-runtime/gnulib-lib/raise.c2
-rw-r--r--gettext-runtime/gnulib-lib/readlink.c2
-rw-r--r--gettext-runtime/gnulib-lib/ref-add.sin2
-rw-r--r--gettext-runtime/gnulib-lib/ref-del.sin2
-rw-r--r--gettext-runtime/gnulib-lib/relocatable.c2
-rw-r--r--gettext-runtime/gnulib-lib/relocatable.h2
-rw-r--r--gettext-runtime/gnulib-lib/relocwrapper.c2
-rw-r--r--gettext-runtime/gnulib-lib/setenv.c2
-rw-r--r--gettext-runtime/gnulib-lib/setlocale.c3
-rw-r--r--gettext-runtime/gnulib-lib/signal.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/sigprocmask.c2
-rw-r--r--gettext-runtime/gnulib-lib/stat.c2
-rw-r--r--gettext-runtime/gnulib-lib/stdbool.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/stddef.in.h8
-rw-r--r--gettext-runtime/gnulib-lib/stdint.in.h16
-rw-r--r--gettext-runtime/gnulib-lib/stdio-write.c2
-rw-r--r--gettext-runtime/gnulib-lib/stdio.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/stdlib.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/str-kmp.h2
-rw-r--r--gettext-runtime/gnulib-lib/streq.h2
-rw-r--r--gettext-runtime/gnulib-lib/strerror-override.c2
-rw-r--r--gettext-runtime/gnulib-lib/strerror-override.h2
-rw-r--r--gettext-runtime/gnulib-lib/strerror.c2
-rw-r--r--gettext-runtime/gnulib-lib/striconv.c2
-rw-r--r--gettext-runtime/gnulib-lib/striconv.h2
-rw-r--r--gettext-runtime/gnulib-lib/string.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/strnlen.c2
-rw-r--r--gettext-runtime/gnulib-lib/strnlen1.c2
-rw-r--r--gettext-runtime/gnulib-lib/strnlen1.h2
-rw-r--r--gettext-runtime/gnulib-lib/strtol.c33
-rw-r--r--gettext-runtime/gnulib-lib/strtoul.c2
-rw-r--r--gettext-runtime/gnulib-lib/sys_stat.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/sys_time.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/sys_types.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/time.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/trim.c2
-rw-r--r--gettext-runtime/gnulib-lib/trim.h2
-rw-r--r--gettext-runtime/gnulib-lib/unistd.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/unistr.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c2
-rw-r--r--gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c2
-rw-r--r--gettext-runtime/gnulib-lib/unistr/u8-uctomb.c2
-rw-r--r--gettext-runtime/gnulib-lib/unitypes.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/uniwidth.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/uniwidth/cjk.h2
-rw-r--r--gettext-runtime/gnulib-lib/uniwidth/width.c2
-rw-r--r--gettext-runtime/gnulib-lib/unlocked-io.h2
-rw-r--r--gettext-runtime/gnulib-lib/verify.h2
-rw-r--r--gettext-runtime/gnulib-lib/wchar.in.h9
-rw-r--r--gettext-runtime/gnulib-lib/wctype.in.h2
-rw-r--r--gettext-runtime/gnulib-lib/wcwidth.c2
-rw-r--r--gettext-runtime/gnulib-lib/xalloc.h2
-rw-r--r--gettext-runtime/gnulib-lib/xmalloc.c4
-rw-r--r--gettext-runtime/gnulib-lib/xreadlink.c2
-rw-r--r--gettext-runtime/gnulib-lib/xreadlink.h2
-rw-r--r--gettext-runtime/gnulib-lib/xstrdup.c2
-rw-r--r--gettext-runtime/gnulib-lib/xstriconv.c2
-rw-r--r--gettext-runtime/gnulib-lib/xstriconv.h2
127 files changed, 335 insertions, 229 deletions
diff --git a/gettext-runtime/gnulib-lib/Makefile.am b/gettext-runtime/gnulib-lib/Makefile.am
index d705e5c..2fec716 100644
--- a/gettext-runtime/gnulib-lib/Makefile.am
+++ b/gettext-runtime/gnulib-lib/Makefile.am
@@ -1,6 +1,6 @@
## DO NOT EDIT! GENERATED AUTOMATICALLY!
## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -322,6 +322,14 @@ V_GPERF_0 = @echo " GPERF " $@;
## end gnulib module gperf
+## begin gnulib module hard-locale
+
+libgrt_a_SOURCES += hard-locale.c
+
+EXTRA_DIST += hard-locale.h
+
+## end gnulib module hard-locale
+
## begin gnulib module havelib
diff --git a/gettext-runtime/gnulib-lib/Makefile.in b/gettext-runtime/gnulib-lib/Makefile.in
index aa1fcde..b69229f 100644
--- a/gettext-runtime/gnulib-lib/Makefile.in
+++ b/gettext-runtime/gnulib-lib/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -140,6 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+ $(top_srcdir)/gnulib-m4/hard-locale.m4 \
$(top_srcdir)/gnulib-m4/iconv_h.m4 \
$(top_srcdir)/gnulib-m4/iconv_open.m4 \
$(top_srcdir)/gnulib-m4/include_next.m4 \
@@ -247,15 +248,15 @@ am__DEPENDENCIES_1 =
am__libgrt_a_SOURCES_DIST = allocator.c areadlink.c basename.h \
basename.c c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c \
c-strncasecmp.c careadlinkat.c closeout.h closeout.c \
- fwriteerror.h fwriteerror.c gettext.h localcharset.h \
- localcharset.c localename.c glthread/lock.h glthread/lock.c \
- malloca.c mbchar.c mbiter.h mbiter.c mbslen.c mbsstr.c \
- mbuiter.h mbuiter.c progname.h progname.c propername.h \
- propername.c striconv.h striconv.c strnlen1.h strnlen1.c \
- glthread/threadlib.c trim.c unistd.c unistr/u8-mbtoucr.c \
- unistr/u8-uctomb.c unistr/u8-uctomb-aux.c uniwidth/width.c \
- wctype-h.c xalloc.h xmalloc.c xstrdup.c xreadlink.c \
- xstriconv.h xstriconv.c
+ fwriteerror.h fwriteerror.c gettext.h hard-locale.c \
+ localcharset.h localcharset.c localename.c glthread/lock.h \
+ glthread/lock.c malloca.c mbchar.c mbiter.h mbiter.c mbslen.c \
+ mbsstr.c mbuiter.h mbuiter.c progname.h progname.c \
+ propername.h propername.c striconv.h striconv.c strnlen1.h \
+ strnlen1.c glthread/threadlib.c trim.c unistd.c \
+ unistr/u8-mbtoucr.c unistr/u8-uctomb.c unistr/u8-uctomb-aux.c \
+ uniwidth/width.c wctype-h.c xalloc.h xmalloc.c xstrdup.c \
+ xreadlink.c xstriconv.h xstriconv.c
am__dirstamp = $(am__leading_dot)dirstamp
@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_1 = unistr/u8-mbtoucr.$(OBJEXT)
@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_2 = unistr/u8-uctomb.$(OBJEXT) \
@@ -264,7 +265,7 @@ am__dirstamp = $(am__leading_dot)dirstamp
am_libgrt_a_OBJECTS = allocator.$(OBJEXT) areadlink.$(OBJEXT) \
basename.$(OBJEXT) c-ctype.$(OBJEXT) c-strcasecmp.$(OBJEXT) \
c-strncasecmp.$(OBJEXT) careadlinkat.$(OBJEXT) \
- closeout.$(OBJEXT) fwriteerror.$(OBJEXT) \
+ closeout.$(OBJEXT) fwriteerror.$(OBJEXT) hard-locale.$(OBJEXT) \
localcharset.$(OBJEXT) localename.$(OBJEXT) \
glthread/lock.$(OBJEXT) malloca.$(OBJEXT) mbchar.$(OBJEXT) \
mbiter.$(OBJEXT) mbslen.$(OBJEXT) mbsstr.$(OBJEXT) \
@@ -1286,7 +1287,7 @@ EXTRA_DIST = alloca.in.h allocator.h areadlink.h atexit.c \
canonicalize-lgpl.c careadlinkat.h \
$(top_srcdir)/../build-aux/csharpcomp.sh.in dosname.h \
errno.in.h error.c error.h getopt.c getopt.in.h getopt1.c \
- getopt_int.h gettimeofday.c \
+ getopt_int.h gettimeofday.c hard-locale.h \
$(top_srcdir)/../build-aux/config.rpath iconv.in.h \
iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \
iconv_open-osf.h iconv_open-solaris.h iconv.c iconv_close.c \
@@ -1376,11 +1377,11 @@ AM_CFLAGS =
libgrt_a_SOURCES = allocator.c areadlink.c basename.h basename.c \
c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c c-strncasecmp.c \
careadlinkat.c closeout.h closeout.c fwriteerror.h \
- fwriteerror.c gettext.h localcharset.h localcharset.c \
- localename.c glthread/lock.h glthread/lock.c malloca.c \
- mbchar.c mbiter.h mbiter.c mbslen.c mbsstr.c mbuiter.h \
- mbuiter.c progname.h progname.c propername.h propername.c \
- striconv.h striconv.c strnlen1.h strnlen1.c \
+ fwriteerror.c gettext.h hard-locale.c localcharset.h \
+ localcharset.c localename.c glthread/lock.h glthread/lock.c \
+ malloca.c mbchar.c mbiter.h mbiter.c mbslen.c mbsstr.c \
+ mbuiter.h mbuiter.c progname.h progname.c propername.h \
+ propername.c striconv.h striconv.c strnlen1.h strnlen1.c \
glthread/threadlib.c trim.c unistd.c $(am__append_2) \
$(am__append_3) $(am__append_4) wctype-h.c xalloc.h xmalloc.c \
xstrdup.c xreadlink.c xstriconv.h xstriconv.c
diff --git a/gettext-runtime/gnulib-lib/alloca.in.h b/gettext-runtime/gnulib-lib/alloca.in.h
index b334262..8603e79 100644
--- a/gettext-runtime/gnulib-lib/alloca.in.h
+++ b/gettext-runtime/gnulib-lib/alloca.in.h
@@ -1,5 +1,5 @@
/* Memory allocation on the stack.
- Copyright (C) 1995, 1999, 2001-2007, 2015 Free Software Foundation,
+ Copyright (C) 1995, 1999, 2001-2007, 2015-2016 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/allocator.h b/gettext-runtime/gnulib-lib/allocator.h
index c7c851f..1f1eab6 100644
--- a/gettext-runtime/gnulib-lib/allocator.h
+++ b/gettext-runtime/gnulib-lib/allocator.h
@@ -1,6 +1,6 @@
/* Memory allocators such as malloc+free.
- Copyright (C) 2011-2015 Free Software Foundation, Inc.
+ Copyright (C) 2011-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/areadlink.c b/gettext-runtime/gnulib-lib/areadlink.c
index 248cc6b..fee84a3 100644
--- a/gettext-runtime/gnulib-lib/areadlink.c
+++ b/gettext-runtime/gnulib-lib/areadlink.c
@@ -1,7 +1,7 @@
/* areadlink.c -- readlink wrapper to return the link name in malloc'd storage
Unlike xreadlink and xreadlink_with_size, don't ever call exit.
- Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003-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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/areadlink.h b/gettext-runtime/gnulib-lib/areadlink.h
index d9e0fa1..829c959 100644
--- a/gettext-runtime/gnulib-lib/areadlink.h
+++ b/gettext-runtime/gnulib-lib/areadlink.h
@@ -1,6 +1,6 @@
/* Read symbolic links without size limitation.
- Copyright (C) 2001, 2003-2004, 2007, 2009-2015 Free Software Foundation,
+ Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/basename.c b/gettext-runtime/gnulib-lib/basename.c
index 56421aa..3518ade 100644
--- a/gettext-runtime/gnulib-lib/basename.c
+++ b/gettext-runtime/gnulib-lib/basename.c
@@ -1,5 +1,5 @@
/* Return the name-within-directory of a file name.
- Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015 Free Software
+ Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015-2016 Free Software
Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gettext-runtime/gnulib-lib/basename.h b/gettext-runtime/gnulib-lib/basename.h
index 489cc67..2d7f0ad 100644
--- a/gettext-runtime/gnulib-lib/basename.h
+++ b/gettext-runtime/gnulib-lib/basename.h
@@ -1,5 +1,5 @@
/* Pathname hacking.
- Copyright (C) 2001-2003, 2010, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2010, 2015-2016 Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/c-ctype.h b/gettext-runtime/gnulib-lib/c-ctype.h
index 1512530..717ae78 100644
--- a/gettext-runtime/gnulib-lib/c-ctype.h
+++ b/gettext-runtime/gnulib-lib/c-ctype.h
@@ -5,7 +5,7 @@
<ctype.h> functions' behaviour depends on the current locale set via
setlocale.
- Copyright (C) 2000-2003, 2006, 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003, 2006, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/c-strcase.h b/gettext-runtime/gnulib-lib/c-strcase.h
index f25bcca..7e570f5 100644
--- a/gettext-runtime/gnulib-lib/c-strcase.h
+++ b/gettext-runtime/gnulib-lib/c-strcase.h
@@ -1,5 +1,5 @@
/* Case-insensitive string comparison functions in C locale.
- Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2015 Free Software
+ Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2016 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/c-strcasecmp.c b/gettext-runtime/gnulib-lib/c-strcasecmp.c
index 6deb6d1..bd113b7 100644
--- a/gettext-runtime/gnulib-lib/c-strcasecmp.c
+++ b/gettext-runtime/gnulib-lib/c-strcasecmp.c
@@ -1,5 +1,5 @@
/* c-strcasecmp.c -- case insensitive string comparator in C locale
- Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/c-strncasecmp.c b/gettext-runtime/gnulib-lib/c-strncasecmp.c
index b98e368..c316929 100644
--- a/gettext-runtime/gnulib-lib/c-strncasecmp.c
+++ b/gettext-runtime/gnulib-lib/c-strncasecmp.c
@@ -1,5 +1,5 @@
/* c-strncasecmp.c -- case insensitive string comparator in C locale
- Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/canonicalize-lgpl.c b/gettext-runtime/gnulib-lib/canonicalize-lgpl.c
index 1c9f2ee..1d0bf65 100644
--- a/gettext-runtime/gnulib-lib/canonicalize-lgpl.c
+++ b/gettext-runtime/gnulib-lib/canonicalize-lgpl.c
@@ -1,5 +1,5 @@
/* Return the canonical absolute name of a given file.
- 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.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/careadlinkat.c b/gettext-runtime/gnulib-lib/careadlinkat.c
index f2f5da2..4180de9 100644
--- a/gettext-runtime/gnulib-lib/careadlinkat.c
+++ b/gettext-runtime/gnulib-lib/careadlinkat.c
@@ -1,6 +1,6 @@
/* Read symbolic links into a buffer without size limitation, relative to fd.
- Copyright (C) 2001, 2003-2004, 2007, 2009-2015 Free Software Foundation,
+ Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/careadlinkat.h b/gettext-runtime/gnulib-lib/careadlinkat.h
index 4eb9fcc..84ede3e 100644
--- a/gettext-runtime/gnulib-lib/careadlinkat.h
+++ b/gettext-runtime/gnulib-lib/careadlinkat.h
@@ -1,6 +1,6 @@
/* Read symbolic links into a buffer without size limitation, relative to fd.
- Copyright (C) 2011-2015 Free Software Foundation, Inc.
+ Copyright (C) 2011-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/closeout.c b/gettext-runtime/gnulib-lib/closeout.c
index a790176..8bba65b 100644
--- a/gettext-runtime/gnulib-lib/closeout.c
+++ b/gettext-runtime/gnulib-lib/closeout.c
@@ -1,5 +1,5 @@
/* closeout.c - close standard output and standard error
- Copyright (C) 1998-2007, 2012, 2015 Free Software Foundation, Inc.
+ Copyright (C) 1998-2007, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/closeout.h b/gettext-runtime/gnulib-lib/closeout.h
index 896e22f..284d1e7 100644
--- a/gettext-runtime/gnulib-lib/closeout.h
+++ b/gettext-runtime/gnulib-lib/closeout.h
@@ -1,5 +1,5 @@
/* Close standard output and standard error.
- Copyright (C) 1998-2003, 2006, 2015 Free Software Foundation, Inc.
+ Copyright (C) 1998-2003, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/config.charset b/gettext-runtime/gnulib-lib/config.charset
index f06d7e9..947d916 100644
--- a/gettext-runtime/gnulib-lib/config.charset
+++ b/gettext-runtime/gnulib-lib/config.charset
@@ -1,7 +1,7 @@
#! /bin/sh
# Output a system dependent table of character encoding aliases.
#
-# Copyright (C) 2000-2004, 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2004, 2006-2016 Free Software Foundation, Inc.
#
# 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
diff --git a/gettext-runtime/gnulib-lib/dosname.h b/gettext-runtime/gnulib-lib/dosname.h
index 893baf6..83a953f 100644
--- a/gettext-runtime/gnulib-lib/dosname.h
+++ b/gettext-runtime/gnulib-lib/dosname.h
@@ -1,6 +1,6 @@
/* File names on MS-DOS/Windows systems.
- Copyright (C) 2000-2001, 2004-2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000-2001, 2004-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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/errno.in.h b/gettext-runtime/gnulib-lib/errno.in.h
index affbb97..b8397ee 100644
--- a/gettext-runtime/gnulib-lib/errno.in.h
+++ b/gettext-runtime/gnulib-lib/errno.in.h
@@ -1,6 +1,6 @@
/* A POSIX-like <errno.h>.
- Copyright (C) 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/error.c b/gettext-runtime/gnulib-lib/error.c
index 0ac7695..56ac889 100644
--- a/gettext-runtime/gnulib-lib/error.c
+++ b/gettext-runtime/gnulib-lib/error.c
@@ -1,5 +1,5 @@
/* Error handler for noninteractive utilities
- Copyright (C) 1990-1998, 2000-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 1990-1998, 2000-2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/error.h b/gettext-runtime/gnulib-lib/error.h
index c5b3736..a9c19cb 100644
--- a/gettext-runtime/gnulib-lib/error.h
+++ b/gettext-runtime/gnulib-lib/error.h
@@ -1,5 +1,5 @@
/* Declaration for error-reporting function
- Copyright (C) 1995-1997, 2003, 2006, 2008-2015 Free Software Foundation,
+ Copyright (C) 1995-1997, 2003, 2006, 2008-2016 Free Software Foundation,
Inc.
This file is part of the GNU C Library.
diff --git a/gettext-runtime/gnulib-lib/fwriteerror.c b/gettext-runtime/gnulib-lib/fwriteerror.c
index 8e7c3ea..3581975 100644
--- a/gettext-runtime/gnulib-lib/fwriteerror.c
+++ b/gettext-runtime/gnulib-lib/fwriteerror.c
@@ -1,5 +1,5 @@
/* Detect write error on a stream.
- 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/gnulib-lib/fwriteerror.h b/gettext-runtime/gnulib-lib/fwriteerror.h
index 438f453..af548da 100644
--- a/gettext-runtime/gnulib-lib/fwriteerror.h
+++ b/gettext-runtime/gnulib-lib/fwriteerror.h
@@ -1,5 +1,5 @@
/* Detect write error on a stream.
- Copyright (C) 2003, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005-2006, 2009-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/gnulib-lib/getopt.c b/gettext-runtime/gnulib-lib/getopt.c
index 212cbf7..8ccb901 100644
--- a/gettext-runtime/gnulib-lib/getopt.c
+++ b/gettext-runtime/gnulib-lib/getopt.c
@@ -2,7 +2,7 @@
NOTE: getopt is part of the C library, so if you don't know what
"Keep this file name-space clean" means, talk to drepper@gnu.org
before changing it!
- Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2015 Free Software
+ Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2016 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/gettext-runtime/gnulib-lib/getopt.in.h b/gettext-runtime/gnulib-lib/getopt.in.h
index f869970..4f6d2e7 100644
--- a/gettext-runtime/gnulib-lib/getopt.in.h
+++ b/gettext-runtime/gnulib-lib/getopt.in.h
@@ -1,5 +1,5 @@
/* Declarations for getopt.
- Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2015 Free Software
+ Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2016 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/gettext-runtime/gnulib-lib/getopt1.c b/gettext-runtime/gnulib-lib/getopt1.c
index 2b1feb6..63db74f 100644
--- a/gettext-runtime/gnulib-lib/getopt1.c
+++ b/gettext-runtime/gnulib-lib/getopt1.c
@@ -1,5 +1,5 @@
/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2015 Free Software
+ Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2016 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/gettext-runtime/gnulib-lib/getopt_int.h b/gettext-runtime/gnulib-lib/getopt_int.h
index e893a6e..be4c22e 100644
--- a/gettext-runtime/gnulib-lib/getopt_int.h
+++ b/gettext-runtime/gnulib-lib/getopt_int.h
@@ -1,5 +1,5 @@
/* Internal declarations for getopt.
- Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2015 Free Software
+ Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2016 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/gettext-runtime/gnulib-lib/gettext.h b/gettext-runtime/gnulib-lib/gettext.h
index f37d586..841b072 100644
--- a/gettext-runtime/gnulib-lib/gettext.h
+++ b/gettext-runtime/gnulib-lib/gettext.h
@@ -1,6 +1,6 @@
/* Convenience header for conditional use of GNU <libintl.h>.
- Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011, 2015 Free
- Software Foundation, Inc.
+ Copyright (C) 1995-1998, 2000-2002, 2004-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 General Public License as published by
@@ -225,15 +225,17 @@ dcpgettext_expr (const char *domain,
if (msg_ctxt_id != NULL)
#endif
{
+ int found_translation;
memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
msg_ctxt_id[msgctxt_len - 1] = '\004';
memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
translation = dcgettext (domain, msg_ctxt_id, category);
+ found_translation = (translation != msg_ctxt_id);
#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
if (msg_ctxt_id != buf)
free (msg_ctxt_id);
#endif
- if (translation != msg_ctxt_id)
+ if (found_translation)
return translation;
}
return msgid;
@@ -271,15 +273,17 @@ dcnpgettext_expr (const char *domain,
if (msg_ctxt_id != NULL)
#endif
{
+ int found_translation;
memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
msg_ctxt_id[msgctxt_len - 1] = '\004';
memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+ found_translation = !(translation == msg_ctxt_id || translation == msgid_plural);
#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
if (msg_ctxt_id != buf)
free (msg_ctxt_id);
#endif
- if (!(translation == msg_ctxt_id || translation == msgid_plural))
+ if (found_translation)
return translation;
}
return (n == 1 ? msgid : msgid_plural);
diff --git a/gettext-runtime/gnulib-lib/gettimeofday.c b/gettext-runtime/gnulib-lib/gettimeofday.c
index e0e2e69..224ca6a 100644
--- a/gettext-runtime/gnulib-lib/gettimeofday.c
+++ b/gettext-runtime/gnulib-lib/gettimeofday.c
@@ -1,6 +1,6 @@
/* Provide gettimeofday for systems that don't have it or for which it's broken.
- Copyright (C) 2001-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/glthread/lock.c b/gettext-runtime/gnulib-lib/glthread/lock.c
index b64132a..935043b 100644
--- a/gettext-runtime/gnulib-lib/glthread/lock.c
+++ b/gettext-runtime/gnulib-lib/glthread/lock.c
@@ -1,5 +1,5 @@
/* Locking in multithreaded situations.
- Copyright (C) 2005-2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/glthread/lock.h b/gettext-runtime/gnulib-lib/glthread/lock.h
index cf3d0d9..e64506b 100644
--- a/gettext-runtime/gnulib-lib/glthread/lock.h
+++ b/gettext-runtime/gnulib-lib/glthread/lock.h
@@ -1,5 +1,5 @@
/* Locking in multithreaded situations.
- Copyright (C) 2005-2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/glthread/threadlib.c b/gettext-runtime/gnulib-lib/glthread/threadlib.c
index f01d351..be63713 100644
--- a/gettext-runtime/gnulib-lib/glthread/threadlib.c
+++ b/gettext-runtime/gnulib-lib/glthread/threadlib.c
@@ -1,5 +1,5 @@
/* Multithreading primitives.
- Copyright (C) 2005-2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/hard-locale.c b/gettext-runtime/gnulib-lib/hard-locale.c
new file mode 100644
index 0000000..c7d9da5
--- /dev/null
+++ b/gettext-runtime/gnulib-lib/hard-locale.c
@@ -0,0 +1,72 @@
+/* hard-locale.c -- Determine whether a locale is hard.
+
+ Copyright (C) 1997-1999, 2002-2004, 2006-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 General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+
+#include "hard-locale.h"
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __GLIBC__
+# define GLIBC_VERSION __GLIBC__
+#elif defined __UCLIBC__
+# define GLIBC_VERSION 2
+#else
+# define GLIBC_VERSION 0
+#endif
+
+/* Return true if the current CATEGORY locale is hard, i.e. if you
+ can't get away with assuming traditional C or POSIX behavior. */
+bool
+hard_locale (int category)
+{
+ bool hard = true;
+ char const *p = setlocale (category, NULL);
+
+ if (p)
+ {
+ if (2 <= GLIBC_VERSION)
+ {
+ if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+ hard = false;
+ }
+ else
+ {
+ char *locale = strdup (p);
+ if (locale)
+ {
+ /* Temporarily set the locale to the "C" and "POSIX" locales
+ to find their names, so that we can determine whether one
+ or the other is the caller's locale. */
+ if (((p = setlocale (category, "C"))
+ && strcmp (p, locale) == 0)
+ || ((p = setlocale (category, "POSIX"))
+ && strcmp (p, locale) == 0))
+ hard = false;
+
+ /* Restore the caller's locale. */
+ setlocale (category, locale);
+ free (locale);
+ }
+ }
+ }
+
+ return hard;
+}
diff --git a/gettext-runtime/gnulib-lib/hard-locale.h b/gettext-runtime/gnulib-lib/hard-locale.h
new file mode 100644
index 0000000..7644afa
--- /dev/null
+++ b/gettext-runtime/gnulib-lib/hard-locale.h
@@ -0,0 +1,25 @@
+/* Determine whether a locale is hard.
+
+ Copyright (C) 1999, 2003-2004, 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 General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef HARD_LOCALE_H_
+# define HARD_LOCALE_H_ 1
+
+# include <stdbool.h>
+
+bool hard_locale (int);
+
+#endif /* HARD_LOCALE_H_ */
diff --git a/gettext-runtime/gnulib-lib/iconv.c b/gettext-runtime/gnulib-lib/iconv.c
index 28c13c5..9ce9c01 100644
--- a/gettext-runtime/gnulib-lib/iconv.c
+++ b/gettext-runtime/gnulib-lib/iconv.c
@@ -1,5 +1,5 @@
/* Character set conversion.
- Copyright (C) 1999-2001, 2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 1999-2001, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/iconv.in.h b/gettext-runtime/gnulib-lib/iconv.in.h
index 94ab806..cb1da14 100644
--- a/gettext-runtime/gnulib-lib/iconv.in.h
+++ b/gettext-runtime/gnulib-lib/iconv.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <iconv.h>.
- Copyright (C) 2007-2015 Free Software Foundation, Inc.
+ Copyright (C) 2007-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/iconv_close.c b/gettext-runtime/gnulib-lib/iconv_close.c
index 59e0aca..d1cd793 100644
--- a/gettext-runtime/gnulib-lib/iconv_close.c
+++ b/gettext-runtime/gnulib-lib/iconv_close.c
@@ -1,5 +1,5 @@
/* Character set conversion.
- Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/iconv_open.c b/gettext-runtime/gnulib-lib/iconv_open.c
index 09d042d..d5c5a52 100644
--- a/gettext-runtime/gnulib-lib/iconv_open.c
+++ b/gettext-runtime/gnulib-lib/iconv_open.c
@@ -1,5 +1,5 @@
/* Character set conversion.
- Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/intprops.h b/gettext-runtime/gnulib-lib/intprops.h
index ecafaf7..3152139 100644
--- a/gettext-runtime/gnulib-lib/intprops.h
+++ b/gettext-runtime/gnulib-lib/intprops.h
@@ -1,10 +1,10 @@
/* intprops.h -- properties of integer types
- Copyright (C) 2001-2005, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2016 Free Software Foundation, Inc.
- 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
- the Free Software Foundation; either version 3 of the License, or
+ 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 the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -21,6 +21,7 @@
#define _GL_INTPROPS_H
#include <limits.h>
+#include <verify.h>
/* Return a value with the common real type of E and V and the value of V. */
#define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
@@ -36,17 +37,6 @@
an integer. */
#define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
-/* True if negative values of the signed integer type T use two's
- complement, ones' complement, or signed magnitude representation,
- respectively. Much GNU code assumes two's complement, but some
- people like to be portable to all possible C hosts. */
-#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
-#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
-
-/* True if the signed integer expression E uses two's complement. */
-#define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1)
-
/* True if the real type T is signed. */
#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
@@ -55,18 +45,10 @@
#define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
-/* Minimum and maximum values for integer types and expressions. These
- macros have undefined behavior if T is signed and has padding bits.
- If this is a problem for you, please let us know how to fix it for
- your host. */
+/* Minimum and maximum values for integer types and expressions. */
/* The maximum and minimum values for the integer type T. */
-#define TYPE_MINIMUM(t) \
- ((t) (! TYPE_SIGNED (t) \
- ? (t) 0 \
- : TYPE_SIGNED_MAGNITUDE (t) \
- ? ~ (t) 0 \
- : ~ TYPE_MAXIMUM (t)))
+#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
#define TYPE_MAXIMUM(t) \
((t) (! TYPE_SIGNED (t) \
? (t) -1 \
@@ -76,7 +58,7 @@
after integer promotion. E should not have side effects. */
#define _GL_INT_MINIMUM(e) \
(EXPR_SIGNED (e) \
- ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e) \
+ ? ~ _GL_SIGNED_INT_MAXIMUM (e) \
: _GL_INT_CONVERT (e, 0))
#define _GL_INT_MAXIMUM(e) \
(EXPR_SIGNED (e) \
@@ -85,8 +67,25 @@
#define _GL_SIGNED_INT_MAXIMUM(e) \
(((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
+/* This include file assumes that signed types are two's complement without
+ padding bits; the above macros have undefined behavior otherwise.
+ If this is a problem for you, please let us know how to fix it for your host.
+ As a sanity check, test the assumption for some signed types that
+ <limits.h> bounds. */
+verify (TYPE_MINIMUM (signed char) == SCHAR_MIN);
+verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX);
+verify (TYPE_MINIMUM (short int) == SHRT_MIN);
+verify (TYPE_MAXIMUM (short int) == SHRT_MAX);
+verify (TYPE_MINIMUM (int) == INT_MIN);
+verify (TYPE_MAXIMUM (int) == INT_MAX);
+verify (TYPE_MINIMUM (long int) == LONG_MIN);
+verify (TYPE_MAXIMUM (long int) == LONG_MAX);
+#ifdef LLONG_MAX
+verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
+verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+#endif
-/* Return 1 if the __typeof__ keyword works. This could be done by
+/* Does the __typeof__ keyword work? This could be done by
'configure', but for now it's easier to do it by hand. */
#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
|| (0x5110 <= __SUNPRO_C && !__STDC__))
diff --git a/gettext-runtime/gnulib-lib/iswblank.c b/gettext-runtime/gnulib-lib/iswblank.c
index 94be115..8d47ee5 100644
--- a/gettext-runtime/gnulib-lib/iswblank.c
+++ b/gettext-runtime/gnulib-lib/iswblank.c
@@ -1,5 +1,5 @@
/* Test wide character for being blank.
- Copyright (C) 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/langinfo.in.h b/gettext-runtime/gnulib-lib/langinfo.in.h
index 04fd535..e11617c 100644
--- a/gettext-runtime/gnulib-lib/langinfo.in.h
+++ b/gettext-runtime/gnulib-lib/langinfo.in.h
@@ -1,5 +1,5 @@
/* Substitute for and wrapper around <langinfo.h>.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/localcharset.c b/gettext-runtime/gnulib-lib/localcharset.c
index 1f02aa5..b2a0369 100644
--- a/gettext-runtime/gnulib-lib/localcharset.c
+++ b/gettext-runtime/gnulib-lib/localcharset.c
@@ -1,6 +1,6 @@
/* Determine a canonical name for the current locale's character encoding.
- Copyright (C) 2000-2006, 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000-2006, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/localcharset.h b/gettext-runtime/gnulib-lib/localcharset.h
index c5e6d46..915182e 100644
--- a/gettext-runtime/gnulib-lib/localcharset.h
+++ b/gettext-runtime/gnulib-lib/localcharset.h
@@ -1,5 +1,5 @@
/* Determine a canonical name for the current locale's character encoding.
- Copyright (C) 2000-2003, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003, 2009-2016 Free Software Foundation, Inc.
This file is part of the GNU CHARSET Library.
This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/locale.in.h b/gettext-runtime/gnulib-lib/locale.in.h
index 05e974d..4083507 100644
--- a/gettext-runtime/gnulib-lib/locale.in.h
+++ b/gettext-runtime/gnulib-lib/locale.in.h
@@ -1,5 +1,5 @@
/* A POSIX <locale.h>.
- Copyright (C) 2007-2015 Free Software Foundation, Inc.
+ Copyright (C) 2007-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/localename.c b/gettext-runtime/gnulib-lib/localename.c
index c256ad5..e67bd01 100644
--- a/gettext-runtime/gnulib-lib/localename.c
+++ b/gettext-runtime/gnulib-lib/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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/localename.h b/gettext-runtime/gnulib-lib/localename.h
index 13c126d..17f0d85 100644
--- a/gettext-runtime/gnulib-lib/localename.h
+++ b/gettext-runtime/gnulib-lib/localename.h
@@ -1,5 +1,5 @@
/* Determine name of the currently selected locale.
- Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/lstat.c b/gettext-runtime/gnulib-lib/lstat.c
index 31dee13..03b0634 100644
--- a/gettext-runtime/gnulib-lib/lstat.c
+++ b/gettext-runtime/gnulib-lib/lstat.c
@@ -1,6 +1,6 @@
/* Work around a bug of lstat on some systems
- Copyright (C) 1997-2006, 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 1997-2006, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/malloca.c b/gettext-runtime/gnulib-lib/malloca.c
index 198a96c..a613277 100644
--- a/gettext-runtime/gnulib-lib/malloca.c
+++ b/gettext-runtime/gnulib-lib/malloca.c
@@ -1,5 +1,5 @@
/* Safe automatic memory allocation.
- Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006-2007, 2009-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/gnulib-lib/malloca.h b/gettext-runtime/gnulib-lib/malloca.h
index 7a4190c..fa27a9e 100644
--- a/gettext-runtime/gnulib-lib/malloca.h
+++ b/gettext-runtime/gnulib-lib/malloca.h
@@ -1,5 +1,5 @@
/* Safe automatic memory allocation.
- Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003-2007, 2009-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/gnulib-lib/mbchar.c b/gettext-runtime/gnulib-lib/mbchar.c
index ae9b7eb..27796c3 100644
--- a/gettext-runtime/gnulib-lib/mbchar.c
+++ b/gettext-runtime/gnulib-lib/mbchar.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2006, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/mbchar.h b/gettext-runtime/gnulib-lib/mbchar.h
index fcdefaf..2017d86 100644
--- a/gettext-runtime/gnulib-lib/mbchar.h
+++ b/gettext-runtime/gnulib-lib/mbchar.h
@@ -1,5 +1,5 @@
/* Multibyte character data type.
- Copyright (C) 2001, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2005-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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/mbiter.h b/gettext-runtime/gnulib-lib/mbiter.h
index ccc1d19..d72b0a7 100644
--- a/gettext-runtime/gnulib-lib/mbiter.h
+++ b/gettext-runtime/gnulib-lib/mbiter.h
@@ -1,5 +1,5 @@
/* Iterating through multibyte strings: macros for multi-byte encodings.
- Copyright (C) 2001, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2005, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/mbrtowc.c b/gettext-runtime/gnulib-lib/mbrtowc.c
index e49d55b..cdd874b 100644
--- a/gettext-runtime/gnulib-lib/mbrtowc.c
+++ b/gettext-runtime/gnulib-lib/mbrtowc.c
@@ -1,5 +1,5 @@
/* Convert multibyte character to wide character.
- Copyright (C) 1999-2002, 2005-2015 Free Software Foundation, Inc.
+ Copyright (C) 1999-2002, 2005-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,11 @@
/* Specification. */
#include <wchar.h>
+#if C_LOCALE_MAYBE_EILSEQ
+# include "hard-locale.h"
+# include <locale.h>
+#endif
+
#if GNULIB_defined_mbstate_t
/* Implement mbrtowc() on top of mbtowc(). */
@@ -328,6 +333,9 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
size_t
rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
{
+ size_t ret;
+ wchar_t wc;
+
# if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
if (s == NULL)
{
@@ -342,6 +350,9 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
return (size_t) -2;
# endif
+ if (! pwc)
+ pwc = &wc;
+
# if MBRTOWC_RETVAL_BUG
{
static mbstate_t internal_state;
@@ -357,8 +368,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
size_t count = 0;
for (; n > 0; s++, n--)
{
- wchar_t wc;
- size_t ret = mbrtowc (&wc, s, 1, ps);
+ ret = mbrtowc (&wc, s, 1, ps);
if (ret == (size_t)(-1))
return (size_t)(-1);
@@ -366,8 +376,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
if (ret != (size_t)(-2))
{
/* The multibyte character has been completed. */
- if (pwc != NULL)
- *pwc = wc;
+ *pwc = wc;
return (wc == 0 ? 0 : count);
}
}
@@ -376,32 +385,23 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
}
# endif
-# if MBRTOWC_NUL_RETVAL_BUG
- {
- wchar_t wc;
- size_t ret = mbrtowc (&wc, s, n, ps);
+ ret = mbrtowc (pwc, s, n, ps);
- if (ret != (size_t)(-1) && ret != (size_t)(-2))
- {
- if (pwc != NULL)
- *pwc = wc;
- if (wc == 0)
- ret = 0;
- }
- return ret;
- }
-# else
- {
-# if MBRTOWC_NULL_ARG1_BUG
- wchar_t dummy;
-
- if (pwc == NULL)
- pwc = &dummy;
-# endif
+# if MBRTOWC_NUL_RETVAL_BUG
+ if (ret < (size_t) -2 && !*pwc)
+ return 0;
+# endif
- return mbrtowc (pwc, s, n, ps);
- }
+# if C_LOCALE_MAYBE_EILSEQ
+ if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE))
+ {
+ unsigned char uc = *s;
+ *pwc = uc;
+ return 1;
+ }
# endif
+
+ return ret;
}
#endif
diff --git a/gettext-runtime/gnulib-lib/mbsinit.c b/gettext-runtime/gnulib-lib/mbsinit.c
index 4effdd8..372b523 100644
--- a/gettext-runtime/gnulib-lib/mbsinit.c
+++ b/gettext-runtime/gnulib-lib/mbsinit.c
@@ -1,5 +1,5 @@
/* Test for initial conversion state.
- Copyright (C) 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 2008-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/mbslen.c b/gettext-runtime/gnulib-lib/mbslen.c
index 011f821..ed13a42 100644
--- a/gettext-runtime/gnulib-lib/mbslen.c
+++ b/gettext-runtime/gnulib-lib/mbslen.c
@@ -1,5 +1,5 @@
/* Counting the multibyte characters in a string.
- Copyright (C) 2007-2015 Free Software Foundation, Inc.
+ Copyright (C) 2007-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2007.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/mbsstr.c b/gettext-runtime/gnulib-lib/mbsstr.c
index 6d5239e..bc738d4 100644
--- a/gettext-runtime/gnulib-lib/mbsstr.c
+++ b/gettext-runtime/gnulib-lib/mbsstr.c
@@ -1,5 +1,5 @@
/* Searching in a string. -*- coding: utf-8 -*-
- Copyright (C) 2005-2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2005.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/mbuiter.h b/gettext-runtime/gnulib-lib/mbuiter.h
index acdec29..aad4fea 100644
--- a/gettext-runtime/gnulib-lib/mbuiter.h
+++ b/gettext-runtime/gnulib-lib/mbuiter.h
@@ -1,5 +1,5 @@
/* Iterating through multibyte strings: macros for multi-byte encodings.
- Copyright (C) 2001, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2005, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/memchr.c b/gettext-runtime/gnulib-lib/memchr.c
index f74cc9a..b565542 100644
--- a/gettext-runtime/gnulib-lib/memchr.c
+++ b/gettext-runtime/gnulib-lib/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2015
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2016
Free Software Foundation, Inc.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff --git a/gettext-runtime/gnulib-lib/msvc-inval.c b/gettext-runtime/gnulib-lib/msvc-inval.c
index a1f1dc0..baaf39e 100644
--- a/gettext-runtime/gnulib-lib/msvc-inval.c
+++ b/gettext-runtime/gnulib-lib/msvc-inval.c
@@ -1,5 +1,5 @@
/* Invalid parameter handler for MSVC runtime libraries.
- Copyright (C) 2011-2015 Free Software Foundation, Inc.
+ Copyright (C) 2011-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/msvc-inval.h b/gettext-runtime/gnulib-lib/msvc-inval.h
index 8b07269..027c949 100644
--- a/gettext-runtime/gnulib-lib/msvc-inval.h
+++ b/gettext-runtime/gnulib-lib/msvc-inval.h
@@ -1,5 +1,5 @@
/* Invalid parameter handler for MSVC runtime libraries.
- Copyright (C) 2011-2015 Free Software Foundation, Inc.
+ Copyright (C) 2011-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/msvc-nothrow.c b/gettext-runtime/gnulib-lib/msvc-nothrow.c
index 90cf801..ba75bbf 100644
--- a/gettext-runtime/gnulib-lib/msvc-nothrow.c
+++ b/gettext-runtime/gnulib-lib/msvc-nothrow.c
@@ -1,6 +1,6 @@
/* Wrappers that don't throw invalid parameter notifications
with MSVC runtime libraries.
- Copyright (C) 2011-2015 Free Software Foundation, Inc.
+ Copyright (C) 2011-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/msvc-nothrow.h b/gettext-runtime/gnulib-lib/msvc-nothrow.h
index 67b151e..3493b84 100644
--- a/gettext-runtime/gnulib-lib/msvc-nothrow.h
+++ b/gettext-runtime/gnulib-lib/msvc-nothrow.h
@@ -1,6 +1,6 @@
/* Wrappers that don't throw invalid parameter notifications
with MSVC runtime libraries.
- Copyright (C) 2011-2015 Free Software Foundation, Inc.
+ Copyright (C) 2011-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/pathmax.h b/gettext-runtime/gnulib-lib/pathmax.h
index 2f3b64f..aee22f8 100644
--- a/gettext-runtime/gnulib-lib/pathmax.h
+++ b/gettext-runtime/gnulib-lib/pathmax.h
@@ -1,5 +1,5 @@
/* Define PATH_MAX somehow. Requires sys/types.h.
- Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2015 Free Software
+ Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2016 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/progname.c b/gettext-runtime/gnulib-lib/progname.c
index fe93bca..debb760 100644
--- a/gettext-runtime/gnulib-lib/progname.c
+++ b/gettext-runtime/gnulib-lib/progname.c
@@ -1,5 +1,5 @@
/* Program name management.
- Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2001.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/progname.h b/gettext-runtime/gnulib-lib/progname.h
index 15ca3a2..526828f 100644
--- a/gettext-runtime/gnulib-lib/progname.h
+++ b/gettext-runtime/gnulib-lib/progname.h
@@ -1,5 +1,5 @@
/* Program name management.
- Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2001.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/progreloc.c b/gettext-runtime/gnulib-lib/progreloc.c
index 1d2b4b3..6f06897 100644
--- a/gettext-runtime/gnulib-lib/progreloc.c
+++ b/gettext-runtime/gnulib-lib/progreloc.c
@@ -1,5 +1,5 @@
/* Provide relocatable programs.
- Copyright (C) 2003-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003-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/gnulib-lib/propername.c b/gettext-runtime/gnulib-lib/propername.c
index 293e7e3..90ad284 100644
--- a/gettext-runtime/gnulib-lib/propername.c
+++ b/gettext-runtime/gnulib-lib/propername.c
@@ -1,5 +1,5 @@
/* Localization of proper names.
- Copyright (C) 2006-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006-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/gnulib-lib/propername.h b/gettext-runtime/gnulib-lib/propername.h
index 68e617e..83fac08 100644
--- a/gettext-runtime/gnulib-lib/propername.h
+++ b/gettext-runtime/gnulib-lib/propername.h
@@ -1,5 +1,5 @@
/* Localization of proper names. -*- coding: utf-8 -*-
- Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2008-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/gnulib-lib/raise.c b/gettext-runtime/gnulib-lib/raise.c
index d6ba2a1..bf24c3e 100644
--- a/gettext-runtime/gnulib-lib/raise.c
+++ b/gettext-runtime/gnulib-lib/raise.c
@@ -1,6 +1,6 @@
/* Provide a non-threads replacement for the POSIX raise function.
- Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/readlink.c b/gettext-runtime/gnulib-lib/readlink.c
index 965c3e2..e6c3925 100644
--- a/gettext-runtime/gnulib-lib/readlink.c
+++ b/gettext-runtime/gnulib-lib/readlink.c
@@ -1,5 +1,5 @@
/* Stub for readlink().
- Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003-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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/ref-add.sin b/gettext-runtime/gnulib-lib/ref-add.sin
index 6cbe5b5..42d3ab0 100644
--- a/gettext-runtime/gnulib-lib/ref-add.sin
+++ b/gettext-runtime/gnulib-lib/ref-add.sin
@@ -1,6 +1,6 @@
# Add this package to a list of references stored in a text file.
#
-# Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/ref-del.sin b/gettext-runtime/gnulib-lib/ref-del.sin
index f50cf0a..c77b33b 100644
--- a/gettext-runtime/gnulib-lib/ref-del.sin
+++ b/gettext-runtime/gnulib-lib/ref-del.sin
@@ -1,6 +1,6 @@
# Remove this package from a list of references stored in a text file.
#
-# Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/relocatable.c b/gettext-runtime/gnulib-lib/relocatable.c
index bed882d..7a59595 100644
--- a/gettext-runtime/gnulib-lib/relocatable.c
+++ b/gettext-runtime/gnulib-lib/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/gnulib-lib/relocatable.h b/gettext-runtime/gnulib-lib/relocatable.h
index c8911b2..4081f22 100644
--- a/gettext-runtime/gnulib-lib/relocatable.h
+++ b/gettext-runtime/gnulib-lib/relocatable.h
@@ -1,5 +1,5 @@
/* Provide relocatable packages.
- Copyright (C) 2003, 2005, 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 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/gnulib-lib/relocwrapper.c b/gettext-runtime/gnulib-lib/relocwrapper.c
index f85cf9a..5eefa2b 100644
--- a/gettext-runtime/gnulib-lib/relocwrapper.c
+++ b/gettext-runtime/gnulib-lib/relocwrapper.c
@@ -1,5 +1,5 @@
/* Relocating wrapper program.
- Copyright (C) 2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005-2007, 2009-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/gnulib-lib/setenv.c b/gettext-runtime/gnulib-lib/setenv.c
index 6b16fd5..85c32cb 100644
--- a/gettext-runtime/gnulib-lib/setenv.c
+++ b/gettext-runtime/gnulib-lib/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2016 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
diff --git a/gettext-runtime/gnulib-lib/setlocale.c b/gettext-runtime/gnulib-lib/setlocale.c
index ed68ce2..7d366ed 100644
--- a/gettext-runtime/gnulib-lib/setlocale.c
+++ b/gettext-runtime/gnulib-lib/setlocale.c
@@ -1,5 +1,5 @@
/* Set the current locale. -*- coding: utf-8 -*-
- Copyright (C) 2009, 2011-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2011-2016 Free Software Foundation, Inc.
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
@@ -381,6 +381,7 @@ static const struct table_entry language_table[] =
{ "sq", "Albanian" },
{ "sr", "Serbian (Latin)" },
{ "sr@cyrillic", "SRB" }, /* Serbian (Cyrillic) */
+ { "sv", "Swedish" },
{ "sw", "Swahili" },
{ "syr", "Syriac" },
{ "ta", "Tamil" },
diff --git a/gettext-runtime/gnulib-lib/signal.in.h b/gettext-runtime/gnulib-lib/signal.in.h
index 265b72a..ab0a049 100644
--- a/gettext-runtime/gnulib-lib/signal.in.h
+++ b/gettext-runtime/gnulib-lib/signal.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <signal.h>.
- Copyright (C) 2006-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/sigprocmask.c b/gettext-runtime/gnulib-lib/sigprocmask.c
index e29b012..fcbf032 100644
--- a/gettext-runtime/gnulib-lib/sigprocmask.c
+++ b/gettext-runtime/gnulib-lib/sigprocmask.c
@@ -1,5 +1,5 @@
/* POSIX compatible signal blocking.
- Copyright (C) 2006-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006-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/gnulib-lib/stat.c b/gettext-runtime/gnulib-lib/stat.c
index 2209826..62e9e0b 100644
--- a/gettext-runtime/gnulib-lib/stat.c
+++ b/gettext-runtime/gnulib-lib/stat.c
@@ -1,5 +1,5 @@
/* Work around platform bugs in stat.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/stdbool.in.h b/gettext-runtime/gnulib-lib/stdbool.in.h
index 64a1761..7ecf203 100644
--- a/gettext-runtime/gnulib-lib/stdbool.in.h
+++ b/gettext-runtime/gnulib-lib/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/stddef.in.h b/gettext-runtime/gnulib-lib/stddef.in.h
index 698307b..f4c4a10 100644
--- a/gettext-runtime/gnulib-lib/stddef.in.h
+++ b/gettext-runtime/gnulib-lib/stddef.in.h
@@ -1,6 +1,6 @@
/* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 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 General Public License as published by
@@ -81,8 +81,10 @@
# define wchar_t int
#endif
-/* Some platforms lack max_align_t. */
-#if !@HAVE_MAX_ALIGN_T@
+/* Some platforms lack max_align_t. The check for _GCC_MAX_ALIGN_T is
+ a hack in case the configure-time test was done with g++ even though
+ we are currently compiling with gcc. */
+#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T)
/* On the x86, the maximum storage alignment of double, long, etc. is 4,
but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,
and the C11 standard allows this. Work around this problem by
diff --git a/gettext-runtime/gnulib-lib/stdint.in.h b/gettext-runtime/gnulib-lib/stdint.in.h
index 378de2e..cf65ec6 100644
--- a/gettext-runtime/gnulib-lib/stdint.in.h
+++ b/gettext-runtime/gnulib-lib/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2016 Free Software Foundation, Inc.
Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
This file is part of gnulib.
@@ -118,15 +118,10 @@
picky compilers. */
#define _STDINT_MIN(signed, bits, zero) \
- ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
+ ((signed) ? ~ _STDINT_MAX (signed, bits, zero) : (zero))
#define _STDINT_MAX(signed, bits, zero) \
- ((signed) \
- ? ~ _STDINT_MIN (signed, bits, zero) \
- : /* The expression for the unsigned case. The subtraction of (signed) \
- is a nop in the unsigned case and avoids "signed integer overflow" \
- warnings in the signed case. */ \
- ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
+ (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
#if !GNULIB_defined_stdint_types
@@ -288,12 +283,17 @@ typedef gl_uint_fast32_t gl_uint_fast16_t;
/* 7.18.1.4. Integer types capable of holding object pointers */
+/* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own
+ definitions of intptr_t and uintptr_t (which use int and unsigned)
+ to avoid clashes with declarations of system functions like sbrk. */
+#ifndef _INTPTR_T_DECLARED
#undef intptr_t
#undef uintptr_t
typedef long int gl_intptr_t;
typedef unsigned long int gl_uintptr_t;
#define intptr_t gl_intptr_t
#define uintptr_t gl_uintptr_t
+#endif
/* 7.18.1.5. Greatest-width integer types */
diff --git a/gettext-runtime/gnulib-lib/stdio-write.c b/gettext-runtime/gnulib-lib/stdio-write.c
index b913101..072e55b 100644
--- a/gettext-runtime/gnulib-lib/stdio-write.c
+++ b/gettext-runtime/gnulib-lib/stdio-write.c
@@ -1,5 +1,5 @@
/* POSIX compatible FILE stream write function.
- Copyright (C) 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 2008-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/stdio.in.h b/gettext-runtime/gnulib-lib/stdio.in.h
index ec43874..9b31365 100644
--- a/gettext-runtime/gnulib-lib/stdio.in.h
+++ b/gettext-runtime/gnulib-lib/stdio.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <stdio.h>.
- Copyright (C) 2004, 2007-2015 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2007-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/stdlib.in.h b/gettext-runtime/gnulib-lib/stdlib.in.h
index 428a119..70dc88d 100644
--- a/gettext-runtime/gnulib-lib/stdlib.in.h
+++ b/gettext-runtime/gnulib-lib/stdlib.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <stdlib.h>.
- Copyright (C) 1995, 2001-2004, 2006-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2001-2004, 2006-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/str-kmp.h b/gettext-runtime/gnulib-lib/str-kmp.h
index 66fcead..fcb2813 100644
--- a/gettext-runtime/gnulib-lib/str-kmp.h
+++ b/gettext-runtime/gnulib-lib/str-kmp.h
@@ -1,6 +1,6 @@
/* Substring search in a NUL terminated string of UNIT elements,
using the Knuth-Morris-Pratt algorithm.
- Copyright (C) 2005-2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2005.
This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/streq.h b/gettext-runtime/gnulib-lib/streq.h
index 6107fc6..234f075 100644
--- a/gettext-runtime/gnulib-lib/streq.h
+++ b/gettext-runtime/gnulib-lib/streq.h
@@ -1,5 +1,5 @@
/* Optimized string comparison.
- Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 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 General Public License as published
diff --git a/gettext-runtime/gnulib-lib/strerror-override.c b/gettext-runtime/gnulib-lib/strerror-override.c
index 2bb4d74..9bc9b18 100644
--- a/gettext-runtime/gnulib-lib/strerror-override.c
+++ b/gettext-runtime/gnulib-lib/strerror-override.c
@@ -1,6 +1,6 @@
/* strerror-override.c --- POSIX compatible system error routine
- Copyright (C) 2010-2015 Free Software Foundation, Inc.
+ Copyright (C) 2010-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/strerror-override.h b/gettext-runtime/gnulib-lib/strerror-override.h
index 7af36df..5264fd5 100644
--- a/gettext-runtime/gnulib-lib/strerror-override.h
+++ b/gettext-runtime/gnulib-lib/strerror-override.h
@@ -1,6 +1,6 @@
/* strerror-override.h --- POSIX compatible system error routine
- Copyright (C) 2010-2015 Free Software Foundation, Inc.
+ Copyright (C) 2010-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/strerror.c b/gettext-runtime/gnulib-lib/strerror.c
index adba738..45c7633 100644
--- a/gettext-runtime/gnulib-lib/strerror.c
+++ b/gettext-runtime/gnulib-lib/strerror.c
@@ -1,6 +1,6 @@
/* strerror.c --- POSIX compatible system error routine
- Copyright (C) 2007-2015 Free Software Foundation, Inc.
+ Copyright (C) 2007-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/striconv.c b/gettext-runtime/gnulib-lib/striconv.c
index 6f7dad8..0d9ccdc 100644
--- a/gettext-runtime/gnulib-lib/striconv.c
+++ b/gettext-runtime/gnulib-lib/striconv.c
@@ -1,5 +1,5 @@
/* Charset conversion.
- Copyright (C) 2001-2007, 2010-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2007, 2010-2016 Free Software Foundation, Inc.
Written by Bruno Haible and Simon Josefsson.
This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/striconv.h b/gettext-runtime/gnulib-lib/striconv.h
index 33cc212..e5217d7 100644
--- a/gettext-runtime/gnulib-lib/striconv.h
+++ b/gettext-runtime/gnulib-lib/striconv.h
@@ -1,5 +1,5 @@
/* Charset conversion.
- Copyright (C) 2001-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc.
Written by Bruno Haible and Simon Josefsson.
This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/string.in.h b/gettext-runtime/gnulib-lib/string.in.h
index 2abd6bc..7fb00c1 100644
--- a/gettext-runtime/gnulib-lib/string.in.h
+++ b/gettext-runtime/gnulib-lib/string.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <string.h>.
- Copyright (C) 1995-1996, 2001-2015 Free Software Foundation, Inc.
+ Copyright (C) 1995-1996, 2001-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/strnlen.c b/gettext-runtime/gnulib-lib/strnlen.c
index 79e250c..1bd7936 100644
--- a/gettext-runtime/gnulib-lib/strnlen.c
+++ b/gettext-runtime/gnulib-lib/strnlen.c
@@ -1,5 +1,5 @@
/* Find the length of STRING, but scan at most MAXLEN characters.
- Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc.
Written by Simon Josefsson.
This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/strnlen1.c b/gettext-runtime/gnulib-lib/strnlen1.c
index 48272a8..f5e0ffc 100644
--- a/gettext-runtime/gnulib-lib/strnlen1.c
+++ b/gettext-runtime/gnulib-lib/strnlen1.c
@@ -1,5 +1,5 @@
/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
- 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/strnlen1.h b/gettext-runtime/gnulib-lib/strnlen1.h
index 794e436..d3cd7c1 100644
--- a/gettext-runtime/gnulib-lib/strnlen1.h
+++ b/gettext-runtime/gnulib-lib/strnlen1.h
@@ -1,5 +1,5 @@
/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
- Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2005, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/strtol.c b/gettext-runtime/gnulib-lib/strtol.c
index 1bc1439..6ef8a96 100644
--- a/gettext-runtime/gnulib-lib/strtol.c
+++ b/gettext-runtime/gnulib-lib/strtol.c
@@ -1,6 +1,6 @@
/* Convert string representation of a number into an integer value.
- Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2015 Free Software
+ Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2016 Free Software
Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C
@@ -121,30 +121,19 @@
/* The extra casts in the following macros work around compiler bugs,
e.g., in Cray C 5.0.3.0. */
-/* True if negative values of the signed integer type T use two's
- complement, ones' complement, or signed magnitude representation,
- respectively. Much GNU code assumes two's complement, but some
- people like to be portable to all possible C hosts. */
-# define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-# define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
-# define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
-
/* True if the arithmetic type T is signed. */
# define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-/* The maximum and minimum values for the integer type T. These
- macros have undefined behavior if T is signed and has padding bits.
- If this is a problem for you, please let us know how to fix it for
- your host. */
-# define TYPE_MINIMUM(t) \
- ((t) (! TYPE_SIGNED (t) \
- ? (t) 0 \
- : TYPE_SIGNED_MAGNITUDE (t) \
- ? ~ (t) 0 \
- : ~ TYPE_MAXIMUM (t)))
-# define TYPE_MAXIMUM(t) \
- ((t) (! TYPE_SIGNED (t) \
- ? (t) -1 \
+/* Minimum and maximum values for integer types.
+ These macros have undefined behavior for signed types that either
+ have padding bits or do not use two's complement. If this is a
+ problem for you, please let us know how to fix it for your host. */
+
+/* The maximum and minimum values for the integer type T. */
+# define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
+# define TYPE_MAXIMUM(t) \
+ ((t) (! TYPE_SIGNED (t) \
+ ? (t) -1 \
: ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
# ifndef ULLONG_MAX
diff --git a/gettext-runtime/gnulib-lib/strtoul.c b/gettext-runtime/gnulib-lib/strtoul.c
index 2051777..6a5d4dd 100644
--- a/gettext-runtime/gnulib-lib/strtoul.c
+++ b/gettext-runtime/gnulib-lib/strtoul.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/sys_stat.in.h b/gettext-runtime/gnulib-lib/sys_stat.in.h
index 9f5e853..72d9537 100644
--- a/gettext-runtime/gnulib-lib/sys_stat.in.h
+++ b/gettext-runtime/gnulib-lib/sys_stat.in.h
@@ -1,5 +1,5 @@
/* Provide a more complete sys/stat header file.
- Copyright (C) 2005-2015 Free Software Foundation, Inc.
+ Copyright (C) 2005-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/sys_time.in.h b/gettext-runtime/gnulib-lib/sys_time.in.h
index c556c5d..1623a1d 100644
--- a/gettext-runtime/gnulib-lib/sys_time.in.h
+++ b/gettext-runtime/gnulib-lib/sys_time.in.h
@@ -1,6 +1,6 @@
/* Provide a more complete sys/time.h.
- Copyright (C) 2007-2015 Free Software Foundation, Inc.
+ Copyright (C) 2007-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/sys_types.in.h b/gettext-runtime/gnulib-lib/sys_types.in.h
index 814bc17..8ab0545 100644
--- a/gettext-runtime/gnulib-lib/sys_types.in.h
+++ b/gettext-runtime/gnulib-lib/sys_types.in.h
@@ -1,6 +1,6 @@
/* Provide a more complete sys/types.h.
- Copyright (C) 2011-2015 Free Software Foundation, Inc.
+ Copyright (C) 2011-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/time.in.h b/gettext-runtime/gnulib-lib/time.in.h
index a90552c..865c114 100644
--- a/gettext-runtime/gnulib-lib/time.in.h
+++ b/gettext-runtime/gnulib-lib/time.in.h
@@ -1,6 +1,6 @@
/* A more-standard <time.h>.
- Copyright (C) 2007-2015 Free Software Foundation, Inc.
+ Copyright (C) 2007-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/trim.c b/gettext-runtime/gnulib-lib/trim.c
index 369b20f..6f681a7 100644
--- a/gettext-runtime/gnulib-lib/trim.c
+++ b/gettext-runtime/gnulib-lib/trim.c
@@ -1,5 +1,5 @@
/* Removes leading and/or trailing whitespaces
- Copyright (C) 2006-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/trim.h b/gettext-runtime/gnulib-lib/trim.h
index 8a38a9f..01c22f2 100644
--- a/gettext-runtime/gnulib-lib/trim.h
+++ b/gettext-runtime/gnulib-lib/trim.h
@@ -1,5 +1,5 @@
/* Removes leading and/or trailing whitespaces
- Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/unistd.in.h b/gettext-runtime/gnulib-lib/unistd.in.h
index 93f1ed9..a9ac097 100644
--- a/gettext-runtime/gnulib-lib/unistd.in.h
+++ b/gettext-runtime/gnulib-lib/unistd.in.h
@@ -1,5 +1,5 @@
/* Substitute for and wrapper around <unistd.h>.
- Copyright (C) 2003-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/unistr.in.h b/gettext-runtime/gnulib-lib/unistr.in.h
index be158be..70aa9cb 100644
--- a/gettext-runtime/gnulib-lib/unistr.in.h
+++ b/gettext-runtime/gnulib-lib/unistr.in.h
@@ -1,5 +1,5 @@
/* Elementary Unicode string functions.
- Copyright (C) 2001-2002, 2005-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2005-2016 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published
diff --git a/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c b/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c
index 9cc1500..48f9ca3 100644
--- a/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c
+++ b/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c
@@ -1,5 +1,5 @@
/* Look at first character in UTF-8 string, returning an error code.
- Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2001.
This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c b/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c
index 65445be..d5ff1d6 100644
--- a/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c
+++ b/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c
@@ -1,5 +1,5 @@
/* Conversion UCS-4 to UTF-8.
- Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2002.
This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c b/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c
index a8250f4..419a6b4 100644
--- a/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c
+++ b/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c
@@ -1,5 +1,5 @@
/* Store a character in UTF-8 string.
- Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2002.
This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/unitypes.in.h b/gettext-runtime/gnulib-lib/unitypes.in.h
index d3c47ae..c6ca0ba 100644
--- a/gettext-runtime/gnulib-lib/unitypes.in.h
+++ b/gettext-runtime/gnulib-lib/unitypes.in.h
@@ -1,5 +1,5 @@
/* Elementary types and macros for the GNU UniString library.
- Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2002, 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 General Public License as published
diff --git a/gettext-runtime/gnulib-lib/uniwidth.in.h b/gettext-runtime/gnulib-lib/uniwidth.in.h
index 7694beb..0ab6d25 100644
--- a/gettext-runtime/gnulib-lib/uniwidth.in.h
+++ b/gettext-runtime/gnulib-lib/uniwidth.in.h
@@ -1,5 +1,5 @@
/* Display width functions.
- Copyright (C) 2001-2002, 2005, 2007, 2009-2015 Free Software Foundation,
+ Copyright (C) 2001-2002, 2005, 2007, 2009-2016 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/uniwidth/cjk.h b/gettext-runtime/gnulib-lib/uniwidth/cjk.h
index cdd9a55..0eac6fe 100644
--- a/gettext-runtime/gnulib-lib/uniwidth/cjk.h
+++ b/gettext-runtime/gnulib-lib/uniwidth/cjk.h
@@ -1,5 +1,5 @@
/* Test for CJK encoding.
- Copyright (C) 2001-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2005-2007, 2009-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2002.
This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/uniwidth/width.c b/gettext-runtime/gnulib-lib/uniwidth/width.c
index c7e03b2..bd3b3fc 100644
--- a/gettext-runtime/gnulib-lib/uniwidth/width.c
+++ b/gettext-runtime/gnulib-lib/uniwidth/width.c
@@ -1,5 +1,5 @@
/* Determine display width of Unicode character.
- Copyright (C) 2001-2002, 2006-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2006-2016 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2002.
This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/unlocked-io.h b/gettext-runtime/gnulib-lib/unlocked-io.h
index 06ffac6..c0ece50 100644
--- a/gettext-runtime/gnulib-lib/unlocked-io.h
+++ b/gettext-runtime/gnulib-lib/unlocked-io.h
@@ -1,6 +1,6 @@
/* Prefer faster, non-thread-safe stdio functions if available.
- Copyright (C) 2001-2004, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/verify.h b/gettext-runtime/gnulib-lib/verify.h
index 60eba49..2f43837 100644
--- a/gettext-runtime/gnulib-lib/verify.h
+++ b/gettext-runtime/gnulib-lib/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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/wchar.in.h b/gettext-runtime/gnulib-lib/wchar.in.h
index 684299f..755600f 100644
--- a/gettext-runtime/gnulib-lib/wchar.in.h
+++ b/gettext-runtime/gnulib-lib/wchar.in.h
@@ -1,6 +1,6 @@
/* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
- Copyright (C) 2007-2015 Free Software Foundation, Inc.
+ Copyright (C) 2007-2016 Free Software Foundation, Inc.
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
@@ -31,7 +31,7 @@
@PRAGMA_COLUMNS@
#if (((defined __need_mbstate_t || defined __need_wint_t) \
- && !defined __MINGW32__) \
+ && !defined __MINGW32__ && !defined __KLIBC__) \
|| (defined __hpux \
&& ((defined _INTTYPES_INCLUDED && !defined strtoimax) \
|| defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \
@@ -445,6 +445,11 @@ _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
# if !@HAVE_DECL_WCWIDTH@
/* wcwidth exists but is not declared. */
_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+# elif defined __KLIBC__
+/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a
+ static inline function. The implementation of wcwidth in wcwidth.c
+ causes a "conflicting types" error. */
+# undef wcwidth
# endif
_GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
# endif
diff --git a/gettext-runtime/gnulib-lib/wctype.in.h b/gettext-runtime/gnulib-lib/wctype.in.h
index 9050b7e..3431854 100644
--- a/gettext-runtime/gnulib-lib/wctype.in.h
+++ b/gettext-runtime/gnulib-lib/wctype.in.h
@@ -1,6 +1,6 @@
/* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
- Copyright (C) 2006-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/wcwidth.c b/gettext-runtime/gnulib-lib/wcwidth.c
index d2b7118..b94fad0 100644
--- a/gettext-runtime/gnulib-lib/wcwidth.c
+++ b/gettext-runtime/gnulib-lib/wcwidth.c
@@ -1,5 +1,5 @@
/* Determine the number of screen columns needed for a character.
- Copyright (C) 2006-2007, 2010-2015 Free Software Foundation, Inc.
+ Copyright (C) 2006-2007, 2010-2016 Free Software Foundation, Inc.
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
diff --git a/gettext-runtime/gnulib-lib/xalloc.h b/gettext-runtime/gnulib-lib/xalloc.h
index b261994..f4a329e 100644
--- a/gettext-runtime/gnulib-lib/xalloc.h
+++ b/gettext-runtime/gnulib-lib/xalloc.h
@@ -1,5 +1,5 @@
/* malloc with out of memory checking.
- Copyright (C) 2001-2004, 2006, 2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006, 2015-2016 Free Software Foundation, Inc.
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/xmalloc.c b/gettext-runtime/gnulib-lib/xmalloc.c
index 43dcb94..9d435a5 100644
--- a/gettext-runtime/gnulib-lib/xmalloc.c
+++ b/gettext-runtime/gnulib-lib/xmalloc.c
@@ -1,6 +1,6 @@
/* xmalloc.c -- malloc with out of memory checking
- Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015 Free
- Software Foundation, Inc.
+ Copyright (C) 1990-1996, 2000-2003, 2005-2007, 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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/xreadlink.c b/gettext-runtime/gnulib-lib/xreadlink.c
index 5082d0b..901f946 100644
--- a/gettext-runtime/gnulib-lib/xreadlink.c
+++ b/gettext-runtime/gnulib-lib/xreadlink.c
@@ -1,6 +1,6 @@
/* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
- Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003-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 General Public License as published by
diff --git a/gettext-runtime/gnulib-lib/xreadlink.h b/gettext-runtime/gnulib-lib/xreadlink.h
index a970eb9..555c27d 100644
--- a/gettext-runtime/gnulib-lib/xreadlink.h
+++ b/gettext-runtime/gnulib-lib/xreadlink.h
@@ -1,6 +1,6 @@
/* Reading symbolic links without size limitation.
- Copyright (C) 2001, 2003-2004, 2007, 2009-2015 Free Software Foundation,
+ Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/xstrdup.c b/gettext-runtime/gnulib-lib/xstrdup.c
index 7aa09dc..c7fbe14 100644
--- a/gettext-runtime/gnulib-lib/xstrdup.c
+++ b/gettext-runtime/gnulib-lib/xstrdup.c
@@ -1,5 +1,5 @@
/* xstrdup.c -- copy a string with out of memory checking
- Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015 Free Software
+ Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015-2016 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/xstriconv.c b/gettext-runtime/gnulib-lib/xstriconv.c
index d5e1951..2dbee18 100644
--- a/gettext-runtime/gnulib-lib/xstriconv.c
+++ b/gettext-runtime/gnulib-lib/xstriconv.c
@@ -1,5 +1,5 @@
/* Charset conversion with out-of-memory checking.
- Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc.
Written by Bruno Haible.
This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/xstriconv.h b/gettext-runtime/gnulib-lib/xstriconv.h
index 6319989..61e7c75 100644
--- a/gettext-runtime/gnulib-lib/xstriconv.h
+++ b/gettext-runtime/gnulib-lib/xstriconv.h
@@ -1,5 +1,5 @@
/* Charset conversion with out-of-memory checking.
- Copyright (C) 2001-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc.
Written by Bruno Haible and Simon Josefsson.
This program is free software: you can redistribute it and/or modify