[SCM] GNU libidn branch, master, updated. libidn-1-29-15-g8fb4aad

libidn-commit
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU libidn branch, master, updated. libidn-1-29-15-g8fb4aad

From:	Simon Josefsson
Subject:	[SCM] GNU libidn branch, master, updated. libidn-1-29-15-g8fb4aad
Date:	Mon, 02 Mar 2015 10:52:58 +0000
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=8fb4aad877b52cbd348524cc30fefe141d552f20

The branch, master has been updated
       via  8fb4aad877b52cbd348524cc30fefe141d552f20 (commit)
       via  7059cf86202bb15c54a523bc6af75071e5210408 (commit)
       via  7b5bdb6176e0ce66b77dc9cd5063cd7836ac9a0b (commit)
       via  083588cd7b41f0b2ed01b6b83f72b15e4e92b4e6 (commit)
       via  4a257938ea3086d58f5d9d6be259120871e7943c (commit)
       via  e0f91c7634cc6f415ac4bd55455bbe5e7b47d170 (commit)
       via  a9af5842873291fe711605bcee9af5d591383c33 (commit)
       via  8ba8f7b1216990c22ed2ac991c82a19362a3555d (commit)
       via  c52f98bbd63a397c4aa07b54faa810ac6d454788 (commit)
       via  b78c94f5186ba8faa80dc2c88a2212e928e212b2 (commit)
       via  077df0146b239e6bbffb5c2a7599aa7ca78b2b86 (commit)
       via  0866d26c9050dff28690041f533a73fd7b5158d3 (commit)
      from  52e66f797b61c4174e4e43036345a62e5be407b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8fb4aad877b52cbd348524cc30fefe141d552f20
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 11:35:02 2015 +0100

    Version 1.30.

commit 7059cf86202bb15c54a523bc6af75071e5210408
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 11:34:10 2015 +0100

    Ignore more.

commit 7b5bdb6176e0ce66b77dc9cd5063cd7836ac9a0b
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 11:04:01 2015 +0100

    Ignore more.

commit 083588cd7b41f0b2ed01b6b83f72b15e4e92b4e6
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 10:58:14 2015 +0100

    Sync gdoc.

commit 4a257938ea3086d58f5d9d6be259120871e7943c
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 10:53:29 2015 +0100

    Add.

commit e0f91c7634cc6f415ac4bd55455bbe5e7b47d170
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 10:52:17 2015 +0100

    Sync with TP.

commit a9af5842873291fe711605bcee9af5d591383c33
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 10:49:00 2015 +0100

    Bump gettext to 0.19.3. Use LT_INIT instead of AC_LIBTOOL_WIN32_DLL.

commit 8ba8f7b1216990c22ed2ac991c82a19362a3555d
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 10:44:48 2015 +0100

    Update OpenPGP key.

commit c52f98bbd63a397c4aa07b54faa810ac6d454788
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 10:35:00 2015 +0100

    Update copyright years.

commit b78c94f5186ba8faa80dc2c88a2212e928e212b2
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 10:32:48 2015 +0100

    Update gnulib files.

commit 077df0146b239e6bbffb5c2a7599aa7ca78b2b86
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 10:28:03 2015 +0100

    Add.

commit 0866d26c9050dff28690041f533a73fd7b5158d3
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 2 10:26:43 2015 +0100

    Reimport punycode.h and punycode.c from punycode-spec.gz, and clarifying 
the changes.

-----------------------------------------------------------------------

Summary of changes:
 .clcopying                                         |    2 +-
 .gitignore                                         |   15 +
 AUTHORS                                            |  844 +++++++++++++++++---
 COPYING                                            |    2 +-
 FAQ                                                |    2 +-
 GNUmakefile                                        |    2 +-
 HACKING                                            |    2 +-
 Makefile.am                                        |    2 +-
 NEWS                                               |   14 +-
 README                                             |    2 +-
 THANKS                                             |    2 +-
 TODO                                               |    2 +-
 build-aux/config.rpath                             |    2 +-
 build-aux/csharpcomp.sh.in                         |    2 +-
 build-aux/csharpexec.sh.in                         |    2 +-
 build-aux/gendocs.sh                               |   20 +-
 build-aux/gnupload                                 |    2 +-
 build-aux/pmccabe2html                             |    2 +-
 build-aux/snippet/arg-nonnull.h                    |    2 +-
 build-aux/snippet/c++defs.h                        |    2 +-
 build-aux/snippet/unused-parameter.h               |    2 +-
 build-aux/snippet/warn-on-use.h                    |    2 +-
 build-aux/update-copyright                         |    6 +-
 build-aux/useless-if-before-free                   |    2 +-
 build-aux/vc-list-files                            |    2 +-
 cfg.mk                                             |    2 +-
 configure.ac                                       |    9 +-
 contrib/README                                     |    2 +-
 contrib/doxygen/gdoc2doxygen                       |    2 +-
 contrib/java/Makefile.am                           |    2 +-
 contrib/java/README                                |    2 +-
 csharp/AssemblyInfo.cs                             |    2 +-
 csharp/IDNA.cs                                     |    2 +-
 csharp/IDNAException.cs                            |    2 +-
 csharp/Makefile.am                                 |    2 +-
 csharp/NFKC.cs                                     |    2 +-
 csharp/Punycode.cs                                 |    2 +-
 csharp/PunycodeException.cs                        |    2 +-
 csharp/Stringprep.cs                               |    2 +-
 csharp/StringprepException.cs                      |    2 +-
 csharp/generate/AssemblyInfo.cs                    |    2 +-
 csharp/generate/GenerateNFKC.cs                    |    2 +-
 csharp/generate/GenerateRFC3454.cs                 |    2 +-
 csharp/generate/HashSet.cs                         |    2 +-
 csharp/generate/Program.cs                         |    2 +-
 csharp/generate/Tokenizer.cs                       |    2 +-
 doc/Makefile.am                                    |    4 +-
 doc/cyclo/Makefile.am                              |    2 +-
 doc/gdoc                                           |  371 ++++++---
 doc/gdoc.mk                                        |    2 +-
 doc/gendocs_template                               |    2 +-
 doc/{gendocs_template => gendocs_template_min}     |   64 +-
 doc/java/Makefile.am                               |    2 +-
 doc/libidn.texi                                    |    2 +-
 doc/specifications/punycode-spec.gz                |  Bin 0 -> 21422 bytes
 doc/tld/Makefile.am                                |    2 +-
 doc/tld/README                                     |    2 +-
 doc/tld/fr.tld                                     |    2 +-
 doc/tld/no.tld                                     |    2 +-
 examples/Makefile.am                               |    2 +-
 examples/README                                    |    2 +-
 examples/example.c                                 |    2 +-
 examples/example2.c                                |    2 +-
 examples/example3.c                                |    2 +-
 examples/example4.c                                |    2 +-
 examples/example5.c                                |    2 +-
 gl/Makefile.am                                     |    5 +-
 gl/errno.in.h                                      |    2 +-
 gl/error.c                                         |    4 +-
 gl/error.h                                         |    2 +-
 gl/getopt.c                                        |   54 +-
 gl/getopt.in.h                                     |    2 +-
 gl/getopt1.c                                       |    2 +-
 gl/getopt_int.h                                    |    2 +-
 gl/gettext.h                                       |    2 +-
 gl/intprops.h                                      |    2 +-
 gl/m4/00gnulib.m4                                  |    2 +-
 gl/m4/absolute-header.m4                           |    2 +-
 gl/m4/alloca.m4                                    |    2 +-
 gl/m4/autobuild.m4                                 |    2 +-
 gl/m4/close.m4                                     |    2 +-
 gl/m4/csharp.m4                                    |    2 +-
 gl/m4/csharpcomp.m4                                |    2 +-
 gl/m4/csharpexec.m4                                |    2 +-
 gl/m4/dup2.m4                                      |   86 ++-
 gl/m4/eealloc.m4                                   |    2 +-
 gl/m4/environ.m4                                   |    2 +-
 gl/m4/errno_h.m4                                   |    2 +-
 gl/m4/error.m4                                     |    2 +-
 gl/m4/extensions.m4                                |    7 +-
 gl/m4/extern-inline.m4                             |   11 +-
 gl/m4/fcntl-o.m4                                   |    2 +-
 gl/m4/fcntl_h.m4                                   |    2 +-
 gl/m4/fdopen.m4                                    |    2 +-
 gl/m4/fstat.m4                                     |    2 +-
 gl/m4/getcwd.m4                                    |    9 +-
 gl/m4/getdtablesize.m4                             |    8 +-
 gl/m4/getopt.m4                                    |    2 +-
 gl/m4/gettimeofday.m4                              |    2 +-
 gl/m4/gnulib-cache.m4                              |    2 +-
 gl/m4/gnulib-common.m4                             |   50 +-
 gl/m4/gnulib-comp.m4                               |    9 +-
 gl/m4/gnulib-tool.m4                               |    2 +-
 gl/m4/include_next.m4                              |    2 +-
 gl/m4/inttypes-pri.m4                              |    2 +-
 gl/m4/inttypes.m4                                  |    2 +-
 gl/m4/largefile.m4                                 |    2 +-
 gl/m4/longlong.m4                                  |    2 +-
 gl/m4/lstat.m4                                     |    2 +-
 gl/m4/malloc.m4                                    |    2 +-
 gl/m4/malloca.m4                                   |    2 +-
 gl/m4/manywarnings.m4                              |   32 +-
 gl/m4/mode_t.m4                                    |    2 +-
 gl/m4/msvc-inval.m4                                |    2 +-
 gl/m4/msvc-nothrow.m4                              |    2 +-
 gl/m4/multiarch.m4                                 |    2 +-
 gl/m4/nocrash.m4                                   |    2 +-
 gl/m4/off_t.m4                                     |    2 +-
 gl/m4/open.m4                                      |    2 +-
 gl/m4/pathmax.m4                                   |    2 +-
 gl/m4/putenv.m4                                    |    2 +-
 gl/m4/setenv.m4                                    |    2 +-
 gl/m4/ssize_t.m4                                   |    2 +-
 gl/m4/stat.m4                                      |    2 +-
 gl/m4/stdalign.m4                                  |   57 ++
 gl/m4/stdarg.m4                                    |    2 +-
 gl/m4/stdbool.m4                                   |    2 +-
 gl/m4/stddef_h.m4                                  |   10 +-
 gl/m4/stdint.m4                                    |    2 +-
 gl/m4/stdio_h.m4                                   |   25 +-
 gl/m4/stdlib_h.m4                                  |    4 +-
 gl/m4/strerror.m4                                  |    2 +-
 gl/m4/string_h.m4                                  |    2 +-
 gl/m4/symlink.m4                                   |    2 +-
 gl/m4/sys_socket_h.m4                              |    2 +-
 gl/m4/sys_stat_h.m4                                |    2 +-
 gl/m4/sys_time_h.m4                                |    2 +-
 gl/m4/sys_types_h.m4                               |    2 +-
 gl/m4/time_h.m4                                    |   21 +-
 gl/m4/unistd_h.m4                                  |    6 +-
 gl/m4/valgrind-tests.m4                            |    2 +-
 gl/m4/version-etc.m4                               |    2 +-
 gl/m4/warn-on-use.m4                               |    2 +-
 gl/m4/warnings.m4                                  |    2 +-
 gl/m4/wchar_h.m4                                   |    2 +-
 gl/m4/wchar_t.m4                                   |    2 +-
 gl/m4/wint_t.m4                                    |    2 +-
 gl/msvc-inval.c                                    |    2 +-
 gl/msvc-inval.h                                    |    2 +-
 gl/msvc-nothrow.c                                  |    2 +-
 gl/msvc-nothrow.h                                  |    2 +-
 gl/progname.c                                      |    2 +-
 gl/progname.h                                      |    2 +-
 gl/stdarg.in.h                                     |    2 +-
 gl/stddef.in.h                                     |   43 +-
 gl/stdio.in.h                                      |    9 +-
 gl/strerror-override.c                             |    2 +-
 gl/strerror-override.h                             |    2 +-
 gl/strerror.c                                      |    2 +-
 gl/string.in.h                                     |    2 +-
 gl/sys_types.in.h                                  |    2 +-
 gl/unistd.in.h                                     |   39 +-
 gl/verify.h                                        |    2 +-
 gl/version-etc.c                                   |    4 +-
 gl/version-etc.h                                   |    2 +-
 gltests/Makefile.am                                |   36 +-
 gltests/alloca.in.h                                |    2 +-
 gltests/binary-io.h                                |    2 +-
 gltests/close.c                                    |    2 +-
 gltests/dosname.h                                  |    2 +-
 gltests/dup2.c                                     |    2 +-
 gltests/fcntl.in.h                                 |    6 +-
 gltests/fd-hook.c                                  |    2 +-
 gltests/fd-hook.h                                  |    2 +-
 gltests/fdopen.c                                   |    2 +-
 gltests/fstat.c                                    |    2 +-
 gltests/getcwd-lgpl.c                              |    2 +-
 gltests/getdtablesize.c                            |   44 +-
 gltests/gettimeofday.c                             |    2 +-
 gltests/ignore-value.h                             |    2 +-
 gltests/init.sh                                    |   23 +-
 gltests/inttypes.in.h                              |    2 +-
 gltests/lstat.c                                    |    2 +-
 gltests/macros.h                                   |    2 +-
 gltests/malloc.c                                   |    2 +-
 gltests/malloca.c                                  |    2 +-
 gltests/malloca.h                                  |    2 +-
 gltests/open.c                                     |    2 +-
 gltests/pathmax.h                                  |    2 +-
 gltests/putenv.c                                   |    2 +-
 gltests/same-inode.h                               |    2 +-
 gltests/setenv.c                                   |    2 +-
 gltests/signature.h                                |    2 +-
 gltests/stat.c                                     |    2 +-
 gltests/stdalign.in.h                              |  113 +++
 gltests/stdbool.in.h                               |    2 +-
 gltests/stdint.in.h                                |    2 +-
 gltests/stdlib.in.h                                |   25 +-
 gltests/symlink.c                                  |    2 +-
 gltests/sys_stat.in.h                              |    2 +-
 gltests/sys_time.in.h                              |    2 +-
 gltests/test-alloca-opt.c                          |    2 +-
 gltests/test-binary-io.c                           |    2 +-
 gltests/test-close.c                               |    2 +-
 gltests/test-dup2.c                                |    2 +-
 gltests/test-environ.c                             |    2 +-
 gltests/test-errno.c                               |    2 +-
 gltests/test-fdopen.c                              |    2 +-
 gltests/test-fgetc.c                               |    2 +-
 gltests/test-fputc.c                               |    2 +-
 gltests/test-fread.c                               |    2 +-
 gltests/test-fstat.c                               |    2 +-
 gltests/test-fwrite.c                              |    2 +-
 gltests/test-getcwd-lgpl.c                         |    2 +-
 gltests/test-getdtablesize.c                       |    2 +-
 gltests/test-getopt.c                              |    2 +-
 gltests/test-getopt.h                              |    2 +-
 gltests/test-getopt_long.h                         |    2 +-
 gltests/test-gettimeofday.c                        |    2 +-
 gltests/test-ignore-value.c                        |    2 +-
 gltests/test-init.sh                               |    2 +-
 gltests/test-intprops.c                            |    2 +-
 gltests/test-inttypes.c                            |    2 +-
 gltests/test-lstat.c                               |    2 +-
 gltests/test-lstat.h                               |    2 +-
 gltests/test-malloca.c                             |    2 +-
 gltests/test-open.c                                |    2 +-
 gltests/test-open.h                                |    2 +-
 gltests/test-pathmax.c                             |    2 +-
 gltests/test-setenv.c                              |    2 +-
 gltests/test-stat.c                                |    2 +-
 gltests/test-stat.h                                |    2 +-
 gltests/test-stdalign.c                            |  116 +++
 gltests/test-stdbool.c                             |    2 +-
 gltests/test-stddef.c                              |   15 +-
 gltests/test-stdint.c                              |    2 +-
 gltests/test-stdio.c                               |    2 +-
 gltests/test-strerror.c                            |    2 +-
 gltests/test-symlink.c                             |    2 +-
 gltests/test-symlink.h                             |    2 +-
 gltests/test-sys_time.c                            |    2 +-
 gltests/test-sys_types.c                           |    2 +-
 gltests/test-unsetenv.c                            |    2 +-
 gltests/test-vc-list-files-cvs.sh                  |    2 +-
 gltests/test-vc-list-files-git.sh                  |    2 +-
 gltests/test-verify.c                              |    2 +-
 gltests/test-version-etc.c                         |    2 +-
 gltests/test-version-etc.sh                        |    2 +-
 gltests/time.in.h                                  |    4 +-
 gltests/unsetenv.c                                 |    2 +-
 gltests/version-etc-fsf.c                          |    2 +-
 gltests/wchar.in.h                                 |    2 +-
 java/Makefile.am                                   |    2 +-
 java/src/Makefile.am                               |    2 +-
 java/src/main/Makefile.am                          |    2 +-
 java/src/main/java/Makefile.am                     |    2 +-
 java/src/main/java/gnu/Makefile.am                 |    2 +-
 java/src/main/java/gnu/inet/Makefile.am            |    2 +-
 java/src/main/java/gnu/inet/encoding/IDNA.java     |    2 +-
 .../main/java/gnu/inet/encoding/IDNAException.java |    2 +-
 java/src/main/java/gnu/inet/encoding/Makefile.am   |    2 +-
 java/src/main/java/gnu/inet/encoding/NFKC.java     |    2 +-
 java/src/main/java/gnu/inet/encoding/Punycode.java |    2 +-
 .../java/gnu/inet/encoding/PunycodeException.java  |    2 +-
 java/src/main/java/gnu/inet/encoding/RangeSet.java |    2 +-
 .../main/java/gnu/inet/encoding/Stringprep.java    |    2 +-
 .../gnu/inet/encoding/StringprepException.java     |    2 +-
 java/src/test/Makefile.am                          |    2 +-
 java/src/test/java/Makefile.am                     |    2 +-
 .../test/java/gnu/inet/encoding/RangeSetTest.java  |    2 +-
 .../java/gnu/inet/encoding/StringprepTest.java     |    2 +-
 .../inet/encoding/caliper/CaliperStringprep.java   |    2 +-
 java/src/util/Makefile.am                          |    2 +-
 java/src/util/java/GenerateNFKC.java               |    2 +-
 java/src/util/java/GenerateRFC3454.java            |    2 +-
 java/src/util/java/Makefile.am                     |    2 +-
 java/src/util/java/TestIDNA.java                   |    2 +-
 java/src/util/java/TestNFKC.java                   |    2 +-
 lib/Makefile.am                                    |    2 +-
 lib/gen-stringprep-tables.pl                       |    2 +-
 lib/gen-tld-tables.pl                              |    2 +-
 lib/gen-unicode-tables.pl                          |    2 +-
 lib/gl/Makefile.am                                 |    3 +-
 lib/gl/c-ctype.c                                   |    2 +-
 lib/gl/c-ctype.h                                   |    2 +-
 lib/gl/c-strcase.h                                 |    2 +-
 lib/gl/c-strcasecmp.c                              |    2 +-
 lib/gl/c-strncasecmp.c                             |    2 +-
 lib/gl/gettext.h                                   |    2 +-
 lib/gl/iconv.c                                     |    2 +-
 lib/gl/iconv.in.h                                  |    2 +-
 lib/gl/iconv_close.c                               |    2 +-
 lib/gl/iconv_open.c                                |    2 +-
 lib/gl/m4/00gnulib.m4                              |    2 +-
 lib/gl/m4/absolute-header.m4                       |    2 +-
 lib/gl/m4/alloca.m4                                |    2 +-
 lib/gl/m4/codeset.m4                               |    2 +-
 lib/gl/m4/eealloc.m4                               |    2 +-
 lib/gl/m4/environ.m4                               |    2 +-
 lib/gl/m4/extensions.m4                            |    7 +-
 lib/gl/m4/extern-inline.m4                         |   11 +-
 lib/gl/m4/gnulib-cache.m4                          |    2 +-
 lib/gl/m4/gnulib-common.m4                         |   50 +-
 lib/gl/m4/gnulib-comp.m4                           |   18 +-
 lib/gl/m4/gnulib-tool.m4                           |    2 +-
 lib/gl/m4/iconv.m4                                 |   63 +-
 lib/gl/m4/iconv_h.m4                               |    2 +-
 lib/gl/m4/iconv_open.m4                            |    2 +-
 lib/gl/m4/include_next.m4                          |    2 +-
 lib/gl/m4/inline.m4                                |    2 +-
 lib/gl/m4/intlmacosx.m4                            |    2 +-
 lib/gl/m4/inttypes-pri.m4                          |    2 +-
 lib/gl/m4/inttypes.m4                              |    2 +-
 lib/gl/m4/langinfo_h.m4                            |  105 +++
 lib/gl/m4/lcmessage.m4                             |    2 +-
 lib/gl/m4/ld-output-def.m4                         |    2 +-
 lib/gl/m4/ld-version-script.m4                     |   47 +-
 lib/gl/m4/lib-ld.m4                                |    2 +-
 lib/gl/m4/lib-link.m4                              |    2 +-
 lib/gl/m4/lib-prefix.m4                            |    2 +-
 lib/gl/m4/libunistring-base.m4                     |    2 +-
 lib/gl/m4/locale-fr.m4                             |    2 +-
 lib/gl/m4/locale-ja.m4                             |    2 +-
 lib/gl/m4/locale-tr.m4                             |    2 +-
 lib/gl/m4/locale-zh.m4                             |    2 +-
 lib/gl/m4/locale_h.m4                              |    2 +-
 lib/gl/m4/localename.m4                            |    2 +-
 lib/gl/m4/lock.m4                                  |    2 +-
 lib/gl/m4/longlong.m4                              |    2 +-
 lib/gl/m4/malloc.m4                                |    2 +-
 lib/gl/m4/malloca.m4                               |    2 +-
 lib/gl/m4/multiarch.m4                             |    2 +-
 lib/gl/m4/off_t.m4                                 |    2 +-
 lib/gl/m4/putenv.m4                                |    2 +-
 lib/gl/m4/setenv.m4                                |    2 +-
 lib/gl/m4/setlocale.m4                             |    2 +-
 lib/gl/m4/ssize_t.m4                               |    2 +-
 lib/gl/m4/stdalign.m4                              |   57 ++
 lib/gl/m4/stdbool.m4                               |    2 +-
 lib/gl/m4/stddef_h.m4                              |   10 +-
 lib/gl/m4/stdint.m4                                |    2 +-
 lib/gl/m4/stdlib_h.m4                              |    4 +-
 lib/gl/m4/string_h.m4                              |    2 +-
 lib/gl/m4/strverscmp.m4                            |    2 +-
 lib/gl/m4/sys_types_h.m4                           |    2 +-
 lib/gl/m4/thread.m4                                |    2 +-
 lib/gl/m4/threadlib.m4                             |   40 +-
 lib/gl/m4/unistd_h.m4                              |    6 +-
 lib/gl/m4/visibility.m4                            |    2 +-
 lib/gl/m4/warn-on-use.m4                           |    2 +-
 lib/gl/m4/wchar_h.m4                               |    2 +-
 lib/gl/m4/wchar_t.m4                               |    2 +-
 lib/gl/m4/wint_t.m4                                |    2 +-
 lib/gl/m4/yield.m4                                 |    2 +-
 lib/gl/stdbool.in.h                                |    2 +-
 lib/gl/stddef.in.h                                 |   43 +-
 lib/gl/stdint.in.h                                 |    2 +-
 lib/gl/striconv.c                                  |    2 +-
 lib/gl/striconv.h                                  |    2 +-
 lib/gl/string.in.h                                 |    2 +-
 lib/gl/strverscmp.c                                |    2 +-
 lib/gl/sys_types.in.h                              |    2 +-
 lib/gl/unistr.in.h                                 |    2 +-
 lib/gl/unistr/u8-mbtoucr.c                         |    2 +-
 lib/gl/unistr/u8-uctomb-aux.c                      |    2 +-
 lib/gl/unistr/u8-uctomb.c                          |    2 +-
 lib/gl/unitypes.in.h                               |    2 +-
 lib/gltests/Makefile.am                            |   78 ++-
 lib/gltests/alloca.in.h                            |    2 +-
 lib/gltests/glthread/lock.c                        |    2 +-
 lib/gltests/glthread/lock.h                        |    2 +-
 lib/gltests/glthread/thread.c                      |    2 +-
 lib/gltests/glthread/thread.h                      |    2 +-
 lib/gltests/glthread/threadlib.c                   |    2 +-
 lib/gltests/glthread/yield.h                       |    2 +-
 lib/gltests/init.sh                                |   23 +-
 lib/gltests/intprops.h                             |    2 +-
 lib/gltests/inttypes.in.h                          |    2 +-
 lib/gltests/langinfo.in.h                          |  194 +++++
 lib/gltests/locale.in.h                            |    2 +-
 lib/gltests/localename.c                           |   13 +-
 lib/gltests/localename.h                           |    2 +-
 lib/gltests/macros.h                               |    2 +-
 lib/gltests/malloc.c                               |    2 +-
 lib/gltests/malloca.c                              |    2 +-
 lib/gltests/malloca.h                              |    2 +-
 lib/gltests/putenv.c                               |    2 +-
 lib/gltests/setenv.c                               |    2 +-
 lib/gltests/setlocale.c                            |    2 +-
 lib/gltests/signature.h                            |    2 +-
 lib/gltests/stdalign.in.h                          |  113 +++
 lib/gltests/stdlib.in.h                            |   25 +-
 lib/gltests/test-alloca-opt.c                      |    2 +-
 lib/gltests/test-c-ctype.c                         |    2 +-
 lib/gltests/test-c-strcasecmp.c                    |    2 +-
 lib/gltests/test-c-strncasecmp.c                   |    2 +-
 lib/gltests/test-environ.c                         |    2 +-
 lib/gltests/test-iconv.c                           |    2 +-
 lib/gltests/test-init.sh                           |    2 +-
 lib/gltests/test-intprops.c                        |    2 +-
 lib/gltests/test-inttypes.c                        |    2 +-
 lib/gltests/test-langinfo.c                        |   92 +++
 lib/gltests/test-locale.c                          |   13 +-
 lib/gltests/test-localename.c                      |    2 +-
 lib/gltests/test-lock.c                            |    2 +-
 lib/gltests/test-malloca.c                         |    2 +-
 lib/gltests/test-setenv.c                          |    2 +-
 lib/gltests/test-setlocale1.c                      |    2 +-
 lib/gltests/test-setlocale2.c                      |    2 +-
 lib/gltests/test-stdalign.c                        |  116 +++
 lib/gltests/test-stdbool.c                         |    2 +-
 lib/gltests/test-stddef.c                          |   15 +-
 lib/gltests/test-stdint.c                          |    2 +-
 lib/gltests/test-stdlib.c                          |    2 +-
 lib/gltests/test-striconv.c                        |    2 +-
 lib/gltests/test-strverscmp.c                      |    2 +-
 lib/gltests/test-sys_types.c                       |    2 +-
 lib/gltests/test-sys_wait.h                        |    2 +-
 lib/gltests/test-thread_create.c                   |    2 +-
 lib/gltests/test-thread_self.c                     |    2 +-
 lib/gltests/test-unistd.c                          |    2 +-
 lib/gltests/test-unsetenv.c                        |    2 +-
 lib/gltests/test-verify.c                          |    2 +-
 lib/gltests/unistd.in.h                            |   39 +-
 lib/gltests/unistr/test-u8-mbtoucr.c               |    2 +-
 lib/gltests/unistr/test-u8-uctomb.c                |    2 +-
 lib/gltests/unsetenv.c                             |    2 +-
 lib/gltests/verify.h                               |    2 +-
 lib/gltests/wchar.in.h                             |    2 +-
 lib/idn-free.c                                     |    2 +-
 lib/idn-free.h                                     |    2 +-
 lib/idna.c                                         |    2 +-
 lib/idna.h                                         |    2 +-
 lib/libidn.map                                     |    2 +-
 lib/nfkc.c                                         |    2 +-
 lib/pr29.c                                         |    2 +-
 lib/pr29.h                                         |    2 +-
 lib/profiles.c                                     |    2 +-
 lib/punycode.c                                     |   57 +-
 lib/punycode.h                                     |   62 +-
 lib/strerror-idna.c                                |    2 +-
 lib/strerror-pr29.c                                |    2 +-
 lib/strerror-punycode.c                            |    2 +-
 lib/strerror-stringprep.c                          |    2 +-
 lib/strerror-tld.c                                 |    2 +-
 lib/stringprep.c                                   |    2 +-
 lib/stringprep.h                                   |    2 +-
 lib/tld.c                                          |    2 +-
 lib/tld.h                                          |    2 +-
 lib/toutf8.c                                       |    2 +-
 lib/version.c                                      |    2 +-
 libc/README                                        |    2 +-
 libc/example.c                                     |    2 +-
 libc/getaddrinfo-idn.txt                           |    2 +-
 libidn.pc.in                                       |    2 +-
 m4/update-header-version.m4                        |    5 +-
 maint.mk                                           |   14 +-
 po/LINGUAS                                         |    1 +
 po/{hr.po.in => hu.po.in}                          |  157 ++--
 po/vi.po.in                                        |   38 +-
 src/Makefile.am                                    |    2 +-
 src/idn.c                                          |    4 +-
 src/idn.ggo                                        |    2 +-
 src/idna.el                                        |    2 +-
 src/punycode.el                                    |    2 +-
 tests/Makefile.am                                  |    2 +-
 tests/libidn.supp                                  |    2 +-
 tests/tst_idna.c                                   |    2 +-
 tests/tst_idna2.c                                  |    2 +-
 tests/tst_idna3.c                                  |    2 +-
 tests/tst_idna4.c                                  |    2 +-
 tests/tst_nfkc.c                                   |    2 +-
 tests/tst_pr29.c                                   |    2 +-
 tests/tst_punycode.c                               |    2 +-
 tests/tst_strerror.c                               |    2 +-
 tests/tst_stringprep.c                             |    2 +-
 tests/tst_symbols.c                                |    2 +-
 tests/tst_tld.c                                    |    2 +-
 tests/tst_toutf8.c                                 |    2 +-
 tests/utils.c                                      |    2 +-
 tests/utils.h                                      |    2 +-
 windows/include/ac-stdint.h                        |    2 +-
 windows/include/config.h                           |    2 +-
 windows/include/idn-int.h                          |    2 +-
 windows/include/stdbool.h                          |    2 +-
 windows/libidn4win.mk                              |    2 +-
 486 files changed, 3433 insertions(+), 1138 deletions(-)
 copy doc/{gendocs_template => gendocs_template_min} (63%)
 create mode 100644 doc/specifications/punycode-spec.gz
 create mode 100644 gl/m4/stdalign.m4
 create mode 100644 gltests/stdalign.in.h
 create mode 100644 gltests/test-stdalign.c
 create mode 100644 lib/gl/m4/langinfo_h.m4
 create mode 100644 lib/gl/m4/stdalign.m4
 create mode 100644 lib/gltests/langinfo.in.h
 create mode 100644 lib/gltests/stdalign.in.h
 create mode 100644 lib/gltests/test-langinfo.c
 create mode 100644 lib/gltests/test-stdalign.c
 copy po/{hr.po.in => hu.po.in} (59%)

diff --git a/.clcopying b/.clcopying
index ba79945..4abb618 100644
--- a/.clcopying
+++ b/.clcopying
@@ -1,6 +1,6 @@
        -----
 
-       Copyright (C) 2002-2014 Simon Josefsson
+       Copyright (C) 2002-2015 Simon Josefsson
 
        Copying and distribution of this file, with or without
        modification, are permitted provided the copyright notice
diff --git a/.gitignore b/.gitignore
index 125ef0e..bba0c12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ config.log
 config.status
 configure
 contrib/doxygen/Doxyfile
+contrib/doxygen/doxygen_sqlite3.db
 contrib/doxygen/html/
 contrib/doxygen/latex/
 csharp/CombiningClass.cs
@@ -170,6 +171,7 @@ gl/printf-parse.lo
 gl/printf-parse.o
 gl/progname.lo
 gl/progname.o
+gl/stddef.h
 gl/stdio.h
 gl/string.h
 gl/sys/
@@ -244,6 +246,8 @@ gltests/test-getdtablesize
 gltests/test-getdtablesize.o
 gltests/test-getopt
 gltests/test-getopt.o
+gltests/test-gettimeofday
+gltests/test-gettimeofday.o
 gltests/test-ignore-value
 gltests/test-ignore-value.o
 gltests/test-intprops
@@ -278,6 +282,8 @@ gltests/test-signbit
 gltests/test-signbit.o
 gltests/test-stat
 gltests/test-stat.o
+gltests/test-stdalign
+gltests/test-stdalign.o
 gltests/test-stdbool
 gltests/test-stdbool.o
 gltests/test-stddef
@@ -296,6 +302,8 @@ gltests/test-symlink
 gltests/test-symlink.o
 gltests/test-sys_stat
 gltests/test-sys_stat.o
+gltests/test-sys_time
+gltests/test-sys_time.o
 gltests/test-sys_types
 gltests/test-sys_types.o
 gltests/test-sys_wait
@@ -368,6 +376,7 @@ lib/gl/iconv_open-irix.h
 lib/gl/iconv_open-osf.h
 lib/gl/iconv_open-solaris.h
 lib/gl/libgnu.la
+lib/gl/stddef.h
 lib/gl/striconv.lo
 lib/gl/striconv.o
 lib/gl/string.h
@@ -401,6 +410,7 @@ lib/gltests/glthread/lock.o
 lib/gltests/glthread/thread.o
 lib/gltests/glthread/threadlib.o
 lib/gltests/inttypes.h
+lib/gltests/langinfo.h
 lib/gltests/libtests.a
 lib/gltests/locale.h
 lib/gltests/localename.o
@@ -423,6 +433,8 @@ lib/gltests/test-intprops
 lib/gltests/test-intprops.o
 lib/gltests/test-inttypes
 lib/gltests/test-inttypes.o
+lib/gltests/test-langinfo
+lib/gltests/test-langinfo.o
 lib/gltests/test-locale
 lib/gltests/test-locale.o
 lib/gltests/test-localename
@@ -437,6 +449,8 @@ lib/gltests/test-setlocale1
 lib/gltests/test-setlocale1.o
 lib/gltests/test-setlocale2
 lib/gltests/test-setlocale2.o
+lib/gltests/test-stdalign
+lib/gltests/test-stdalign.o
 lib/gltests/test-stdbool
 lib/gltests/test-stdbool.o
 lib/gltests/test-stddef
@@ -519,6 +533,7 @@ libidn-*.tar.gz.sig
 libidn.pc
 libtool
 m4/codeset.m4
+m4/extern-inline.m4
 m4/fcntl-o.m4
 m4/gettext.m4
 m4/glibc2.m4
diff --git a/AUTHORS b/AUTHORS
index 11b037b..babf801 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 Libidn AUTHORS -- Information about the authors.
-Copyright (C) 2002-2014 Simon Josefsson
+Copyright (C) 2002-2015 Simon Josefsson
 See the end for copying conditions.
 
 Simon Josefsson <address@hidden>
@@ -21,7 +21,7 @@ Adam Strzelecki <address@hidden>
 Contributed Windows Visual Studio project files.
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-URL: http://josefsson.org/key.txt
+URL: http://josefsson.org/54265e8c.txt
 Comment: This 0x54265e8c key is used to sign releases of Libidn.
 
 mQHhBFOnKoEBDqCoGZ7KIeZI1cbNFHIVxywetihLsA24nv3bJa/kd7kgkjfxdlcl
@@ -34,94 +34,758 @@ 
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
-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
-TkUqdI7MlHuxWdiWCVluXE7VmQ==
-=eB3/
+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
+olYAad79y0zRxag=
+=iuh9
 -----END PGP PUBLIC KEY BLOCK-----
 
 ----------------------------------------------------------------------
diff --git a/COPYING b/COPYING
index 5034b2a..e6ea90a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
 Libidn COPYING -- Explanation of licensing conditions.
-Copyright (C) 2002-2014 Simon Josefsson
+Copyright (C) 2002-2015 Simon Josefsson
 See the end for copying conditions.
 
 The source code for the C library (libidn.a or libidn.so), the C#
diff --git a/FAQ b/FAQ
index 24eb1d0..b1be9dc 100644
--- a/FAQ
+++ b/FAQ
@@ -1,5 +1,5 @@
 Libidn FAQ -- Anticipated Frequently Asked Questions.
-Copyright (C) 2002-2014 Simon Josefsson
+Copyright (C) 2002-2015 Simon Josefsson
 See the end for copying conditions.
 
 Q#1: Why doesn't Libidn use a separate library for the Unicode
diff --git a/GNUmakefile b/GNUmakefile
index 4ab6429..6617eec 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -5,7 +5,7 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
-# Copyright (C) 2001, 2003, 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006-2015 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/HACKING b/HACKING
index f5fc424..99aa26b 100644
--- a/HACKING
+++ b/HACKING
@@ -1,5 +1,5 @@
 Libidn HACKING -- Information for contributors.                 -*- outline -*-
-Copyright (C) 2009-2014 Simon Josefsson
+Copyright (C) 2009-2015 Simon Josefsson
 See the end for copying conditions.
 
 This file contains instructions for developers and advanced users that
diff --git a/Makefile.am b/Makefile.am
index c05921a..d046ba5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002-2014 Simon Josefsson
+# Copyright (C) 2002-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/NEWS b/NEWS
index 589202e..f6edf5a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,18 @@
 Libidn NEWS -- History of user-visible changes.                 -*- outline -*-
-Copyright (C) 2002-2014 Simon Josefsson
+Copyright (C) 2002-2015 Simon Josefsson
 See the end for copying conditions.
 
-* Version 1.30 (unreleased) [stable]
+* Version 1.30 (released 2015-03-02) [stable]
+
+** libidn: The punycode.{c,h} files were re-imported from RFC 3492bis.
+A comment explaining the origin and what was changed was added.
+
+** Bump gettext to 0.19.3.
+
+** Use LT_INIT instead of AC_LIBTOOL_WIN32_DLL.
+
+** i18n: Added Hungarian translation.  Updated some other languages.
+Thanks to BalÃ¡zs Ãr.
 
 ** API and ABI is backwards compatible with the previous version.
 
diff --git a/README b/README
index 09336b5..3290847 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 Libidn README -- Important introductory notes.
-Copyright (C) 2002-2014 Simon Josefsson
+Copyright (C) 2002-2015 Simon Josefsson
 See the end for copying conditions.
 
 Libidn is a package for internationalized string handling based on the
diff --git a/THANKS b/THANKS
index 7b00763..1f0bceb 100644
--- a/THANKS
+++ b/THANKS
@@ -1,5 +1,5 @@
 Libidn THANKS -- Acknowledgements.
-Copyright (C) 2002-2014 Simon Josefsson
+Copyright (C) 2002-2015 Simon Josefsson
 See the end for copying conditions.
 
 The punycode code was taken from the IETF IDN Punycode specification,
diff --git a/TODO b/TODO
index d3732e0..90adc48 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
 Libidn TODO -- Future directions.
-Copyright (C) 2002-2014 Simon Josefsson
+Copyright (C) 2002-2015 Simon Josefsson
 See the end for copying conditions.
 
 If you like to start working on anything, please let me know so work
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index b625621..a3e25c8 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2014 Free Software Foundation, Inc.
+#   Copyright 1996-2015 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <address@hidden>, 1996
 #
diff --git a/build-aux/csharpcomp.sh.in b/build-aux/csharpcomp.sh.in
index 8e89d68..848fe12 100644
--- a/build-aux/csharpcomp.sh.in
+++ b/build-aux/csharpcomp.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Compile a C# program.
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2015 Free Software Foundation, Inc.
 # Written by Bruno Haible <address@hidden>, 2003.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/build-aux/csharpexec.sh.in b/build-aux/csharpexec.sh.in
index e940294..9cc910f 100644
--- a/build-aux/csharpexec.sh.in
+++ b/build-aux/csharpexec.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Execute a C# program.
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2015 Free Software Foundation, Inc.
 # Written by Bruno Haible <address@hidden>, 2003.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index b2e7b09..46faaaf 100755
--- a/build-aux/gendocs.sh
+++ b/build-aux/gendocs.sh
@@ -2,10 +2,9 @@
 # gendocs.sh -- generate a GNU manual in many formats.  This script is
 #   mentioned in maintain.texi.  See the help message below for usage details.
 
-scriptversion=2014-05-01.10
+scriptversion=2015-01-02.22
 
-# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-# Free Software Foundation, Inc.
+# Copyright 2003-2015 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
@@ -21,14 +20,13 @@ scriptversion=2014-05-01.10
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Original author: Mohit Agarwal.
-# Send bug reports and any other correspondence to address@hidden
+# Send bug reports and any other correspondence to address@hidden
 #
 # The latest version of this script, and the companion template, is
-# available from Texinfo CVS:
-# http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendocs.sh
-# http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendocs_template
+# available from the Gnulib repository:
 #
-# An up-to-date copy is also maintained in Gnulib (gnu.org/software/gnulib).
+# http://git.savannah.gnu.org/cgit/gnulib.git/tree/build-aux/gendocs.sh
+# http://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/gendocs_template
 
 # TODO:
 # - image importation was only implemented for HTML generated by
@@ -39,8 +37,8 @@ scriptversion=2014-05-01.10
 prog=`basename "$0"`
 srcdir=`pwd`
 
-scripturl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs.sh";
-templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs_template";
+scripturl="http://git.savannah.gnu.org/cgit/gnulib.git/plain/build-aux/gendocs.sh";
+templateurl="http://git.savannah.gnu.org/cgit/gnulib.git/plain/doc/gendocs_template";
 
 : ${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="}
 : ${MAKEINFO="makeinfo"}
@@ -134,7 +132,7 @@ locale, since that's the language of most Texinfo manuals.  
If you
 happen to have a non-English manual and non-English web site, see the
 SETLANG setting in the source.
 
-Email bug reports or enhancement requests to address@hidden
+Email bug reports or enhancement requests to address@hidden
 "
 
 MANUAL_TITLE=
diff --git a/build-aux/gnupload b/build-aux/gnupload
index 2da97d8..f87c195 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -3,7 +3,7 @@
 
 scriptversion=2013-03-19.17; # UTC
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2015 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/build-aux/pmccabe2html b/build-aux/pmccabe2html
index 81dd932..1898432 100644
--- a/build-aux/pmccabe2html
+++ b/build-aux/pmccabe2html
@@ -1,6 +1,6 @@
 # pmccabe2html - AWK script to convert pmccabe output to html       -*- awk -*-
 
-# Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# Copyright (C) 2007-2015 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/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h
index 9ee8b15..0d55e2b 100644
--- a/build-aux/snippet/arg-nonnull.h
+++ b/build-aux/snippet/arg-nonnull.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h
index 67b1233..585b38a 100644
--- a/build-aux/snippet/c++defs.h
+++ b/build-aux/snippet/c++defs.h
@@ -1,5 +1,5 @@
 /* C++ compatible function declaration macros.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010-2015 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/build-aux/snippet/unused-parameter.h 
b/build-aux/snippet/unused-parameter.h
index 41d9510..f507eb7 100644
--- a/build-aux/snippet/unused-parameter.h
+++ b/build-aux/snippet/unused-parameter.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific function parameters are not used.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h
index 1c4d7bd..90f4985 100644
--- a/build-aux/snippet/warn-on-use.h
+++ b/build-aux/snippet/warn-on-use.h
@@ -1,5 +1,5 @@
 /* A C macro for emitting warnings if a function is used.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010-2015 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/build-aux/update-copyright b/build-aux/update-copyright
index 90624e9..4eb4b93 100755
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -3,9 +3,9 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" 
${1+"$@"}'
     if 0;
 # Update an FSF copyright year list to include the current year.
 
-my $VERSION = '2013-01-03.09:41'; # UTC
+my $VERSION = '2015-01-15.20:53'; # UTC
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2015 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
@@ -124,7 +124,7 @@ use strict;
 use warnings;
 
 my $copyright_re = 'Copyright';
-my $circle_c_re = '(?:\([cC]\)|@copyright{}|&copy;)';
+my $circle_c_re = '(?:\([cC]\)|@copyright{}|\\\\\(co|&copy;)';
 my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
 $holder ||= 'Free Software Foundation, Inc.';
 my $prefix_max = 5;
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index 4c76c75..82a09b3 100755
--- a/build-aux/useless-if-before-free
+++ b/build-aux/useless-if-before-free
@@ -10,7 +10,7 @@ my $VERSION = '2012-01-06 07:23'; # UTC
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.
 
-# Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# Copyright (C) 2008-2015 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/build-aux/vc-list-files b/build-aux/vc-list-files
index b2bca54..3bf93c3 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -4,7 +4,7 @@
 # Print a version string.
 scriptversion=2011-05-16.22; # UTC
 
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2015 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/cfg.mk b/cfg.mk
index 8b10039..3074bcc 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2014 Simon Josefsson
+# Copyright (C) 2006-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/configure.ac b/configure.ac
index 2184464..b20849e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl Copyright (C) 2002-2014 Simon Josefsson
+dnl Copyright (C) 2002-2015 Simon Josefsson
 dnl
 dnl This file is part of GNU Libidn.
 dnl
@@ -41,10 +41,7 @@ lgl_EARLY
 DLL_VERSION=`expr ${LT_CURRENT} - ${LT_AGE}`
 AC_SUBST(DLL_VERSION)
 
-# We can't replace this with LT_INIT([win32-dll]) yet.  For example,
-# the Ubuntu 8.04 LTS is still shipping a libtool version that doesn't
-# have it.
-AC_LIBTOOL_WIN32_DLL
+LT_INIT([win32-dll])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 AC_PROG_LIBTOOL
 
@@ -52,7 +49,7 @@ AC_PROG_LIBTOOL
 AM_MISSING_PROG(PERL, perl, $missing_dir)
 AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
 AM_GNU_GETTEXT(external)
-AM_GNU_GETTEXT_VERSION(0.18.3)
+AM_GNU_GETTEXT_VERSION(0.19.3)
 AM_ICONV
 AM_PATH_LISPDIR
 
diff --git a/contrib/README b/contrib/README
index 1614fa4..7612f20 100644
--- a/contrib/README
+++ b/contrib/README
@@ -1,5 +1,5 @@
 Libidn contrib/README -- Notes for the contrib/ subdirectory.
-Copyright (C) 2003-2014 Simon Josefsson
+Copyright (C) 2003-2015 Simon Josefsson
 See the end for copying conditions.
 
 The idn-python/ sub-directory contains a Python interface for Libidn,
diff --git a/contrib/doxygen/gdoc2doxygen b/contrib/doxygen/gdoc2doxygen
index e5517a5..011c485 100755
--- a/contrib/doxygen/gdoc2doxygen
+++ b/contrib/doxygen/gdoc2doxygen
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2003-2014 Simon Josefsson
+# Copyright (C) 2003-2015 Simon Josefsson
 
 # 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/contrib/java/Makefile.am b/contrib/java/Makefile.am
index c0a4162..35c3ef1 100644
--- a/contrib/java/Makefile.am
+++ b/contrib/java/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002-2014 Simon Josefsson.
+# Copyright (C) 2002-2015 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/contrib/java/README b/contrib/java/README
index 8ab9646..36d1e76 100644
--- a/contrib/java/README
+++ b/contrib/java/README
@@ -1,5 +1,5 @@
 Libidn README -- Notes for the JAVA API proof of concept.
-Copyright (C) 2003-2014 Simon Josefsson
+Copyright (C) 2003-2015 Simon Josefsson
 See the end for copying conditions.
 
 This directory builds Java *.class files that implement the Libidn
diff --git a/csharp/AssemblyInfo.cs b/csharp/AssemblyInfo.cs
index d63ea37..34791b1 100644
--- a/csharp/AssemblyInfo.cs
+++ b/csharp/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/IDNA.cs b/csharp/IDNA.cs
index e29da78..126c5a6 100644
--- a/csharp/IDNA.cs
+++ b/csharp/IDNA.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/IDNAException.cs b/csharp/IDNAException.cs
index dd50e0b..71c1c1c 100644
--- a/csharp/IDNAException.cs
+++ b/csharp/IDNAException.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/Makefile.am b/csharp/Makefile.am
index 6ecb8b4..5a8f55a 100644
--- a/csharp/Makefile.am
+++ b/csharp/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2005-2014 Simon Josefsson.
+# Copyright (C) 2005-2015 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/csharp/NFKC.cs b/csharp/NFKC.cs
index ef6b6b0..dfdaf44 100644
--- a/csharp/NFKC.cs
+++ b/csharp/NFKC.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/Punycode.cs b/csharp/Punycode.cs
index 5bf1c2a..78c16e5 100644
--- a/csharp/Punycode.cs
+++ b/csharp/Punycode.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/PunycodeException.cs b/csharp/PunycodeException.cs
index 6abb19c..97ceb11 100644
--- a/csharp/PunycodeException.cs
+++ b/csharp/PunycodeException.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/Stringprep.cs b/csharp/Stringprep.cs
index 1673e04..e51f6c0 100644
--- a/csharp/Stringprep.cs
+++ b/csharp/Stringprep.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/StringprepException.cs b/csharp/StringprepException.cs
index 5de5f68..f2a7ae3 100644
--- a/csharp/StringprepException.cs
+++ b/csharp/StringprepException.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/generate/AssemblyInfo.cs b/csharp/generate/AssemblyInfo.cs
index 66637c0..1d8dbdf 100644
--- a/csharp/generate/AssemblyInfo.cs
+++ b/csharp/generate/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/generate/GenerateNFKC.cs b/csharp/generate/GenerateNFKC.cs
index edef752..4c65720 100644
--- a/csharp/generate/GenerateNFKC.cs
+++ b/csharp/generate/GenerateNFKC.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/generate/GenerateRFC3454.cs 
b/csharp/generate/GenerateRFC3454.cs
index a37a3c6..0588a91 100644
--- a/csharp/generate/GenerateRFC3454.cs
+++ b/csharp/generate/GenerateRFC3454.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/generate/HashSet.cs b/csharp/generate/HashSet.cs
index af11dd4..b40f844 100644
--- a/csharp/generate/HashSet.cs
+++ b/csharp/generate/HashSet.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/generate/Program.cs b/csharp/generate/Program.cs
index af9f1a8..4f23830 100644
--- a/csharp/generate/Program.cs
+++ b/csharp/generate/Program.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/csharp/generate/Tokenizer.cs b/csharp/generate/Tokenizer.cs
index 0b48465..7e24d58 100644
--- a/csharp/generate/Tokenizer.cs
+++ b/csharp/generate/Tokenizer.cs
@@ -1,5 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/// Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ///
 /// Author: Alexander Gnauck AG-Software, mailto:address@hidden
 ///
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ecc17e2..0143e03 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002-2014 Simon Josefsson.
+# Copyright (C) 2002-2015 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
@@ -75,6 +75,6 @@ GDOC_MAN_PREFIX = man/
 GDOC_MAN_EXTRA_ARGS = -module $(PACKAGE) -sourceversion $(VERSION) \
        -bugsto $(PACKAGE_BUGREPORT) -pkg-name "$(PACKAGE_NAME)" \
        -includefuncprefix -seeinfo $(PACKAGE) \
-       -copyright "2002-2014 Simon Josefsson" \
+       -copyright "2002-2015 Simon Josefsson" \
        -verbatimcopying
 include $(srcdir)/gdoc.mk
diff --git a/doc/cyclo/Makefile.am b/doc/cyclo/Makefile.am
index 36130de..0a899d7 100644
--- a/doc/cyclo/Makefile.am
+++ b/doc/cyclo/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2008-2014 Simon Josefsson.
+# Copyright (C) 2008-2015 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/doc/gdoc b/doc/gdoc
index d3762d7..afc7229 100755
--- a/doc/gdoc
+++ b/doc/gdoc
@@ -1,15 +1,16 @@
 eval '(exit $?0)' && eval 'exec perl -S "$0" ${1+"$@"}'
-  & eval 'exec perl -S "$0" $argv:q'
+    & eval 'exec perl -S "$0" $argv:q'
     if 0;
-# Generate documentation from source code.
 
-## Copyright (c) 2002-2014 Simon Josefsson
+## Copyright (c) 2002-2015 Simon Josefsson
 ##                    added -texinfo, -listfunc, -pkg-name
 ##                    man page revamp
 ##                    various improvements
 ## Copyright (c) 2001, 2002 Nikos Mavrogiannopoulos
 ##                    added -tex
 ## Copyright (c) 1998 Michael Zucchi
+## Copyright (c) 2013 Adam Sampson
+##                    made highlighting not depend on hash order, for Perl 5.18
 
 # 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
@@ -103,14 +104,14 @@ eval '(exit $?0)' && eval 'exec perl -S "$0" ${1+"$@"}'
 #  * my_function - does my stuff
 #  * @my_arg: its mine damnit
 #  *
-#  * Does my stuff explained. 
+#  * Does my stuff explained.
 #  */
 #
 #  or, could also use:
 # /**
 #  * my_function - does my stuff
 #  * @my_arg: its mine damnit
-#  * Description: Does my stuff explained. 
+#  * Description: Does my stuff explained.
 #  */
 # etc.
 #
@@ -135,57 +136,59 @@ eval '(exit $?0)' && eval 'exec perl -S "$0" ${1+"$@"}'
 use POSIX qw(strftime);
 
 # match expressions used to find embedded type information
-$type_constant = "\\\%(\\w+)";
-$type_func = "(\\w+\\(\\))";
-$type_param = "\\\@(\\w+)";
-$type_struct = "\\\#(\\w+)";
-$type_env = "(\\\$\\w+)";
+$type_constant = "\\\%([A-Za-z0-9_]+)";
+$type_func = "([A-Za-z0-9_]+\\(\\))";
+$type_param = '\@([A-Za-z0-9_]+)\s*';
+$type_struct = "\\\#([A-Za-z0-9_]+)";
+$type_env = "(\\\$[A-Za-z0-9_]+)";
 
 
 # Output conversion substitutions.
 #  One for each output format
 
 # these work fairly well
-%highlights_html = ( $type_constant, "<i>\$1</i>",
-                    $type_func, "<b>\$1</b>",
-                    $type_struct, "<i>\$1</i>",
-                    $type_param, "<tt><b>\$1</b></tt>" );
address@hidden = ( [$type_constant, '"<i>$1</i>"'],
+                    [$type_func, '"<b>$1</b>"'],
+                    [$type_struct, '"<i>$1</i>"'],
+                    [$type_param, '" <tt><b>$1</b></tt> "'] );
 $blankline_html = "<p>";
 
-%highlights_texinfo = ( $type_constant, "address@hidden",
-                       $type_func, "address@hidden",
-                       $type_struct, "address@hidden",
-                       $type_param, "address@hidden" );
address@hidden = ( [$type_param, '" address@hidden "'],
+                       [$type_constant, '"address@hidden "'],
+                       [$type_func, '"address@hidden "'],
+                       [$type_struct, '"address@hidden "'],
+                        );
 $blankline_texinfo = "";
 
-%highlights_tex = ( $type_constant, "{\\\\it \$1}",
-                    $type_func, "{\\\\bf \$1}",
-                    $type_struct, "{\\\\it \$1}",
-                    $type_param, "{\\\\bf \$1}" );
address@hidden = ( [$type_param, '" {\\\bf $1} "'],
+               [$type_constant, '"{\\\it $1}"'],
+               [$type_func, '"{\\\bf $1}"'],
+               [$type_struct, '"{\\\it $1}"'],
+                     );
 $blankline_tex = "\\\\";
 
 # sgml, docbook format
-%highlights_sgml = ( $type_constant, "<replaceable 
class=\"option\">\$1</replaceable>",
-                    $type_func, "<function>\$1</function>",
-                    $type_struct, "<structname>\$1</structname>",
-                    $type_env, "<envar>\$1</envar>",
-                    $type_param, "<parameter>\$1</parameter>" );
address@hidden = ( [$type_constant, '"<replaceable 
class=\"option\">$1</replaceable>"'],
+                    [$type_func, '"<function>$1</function>"'],
+                    [$type_struct, '"<structname>$1</structname>"'],
+                    [$type_env, '"<envar>$1</envar>"'],
+                    [$type_param, '" <parameter>$1</parameter> "'] );
 $blankline_sgml = "</para><para>\n";
 
 # these are pretty rough
-%highlights_man = ( $type_constant, "\\\\fB\$1\\\\fP",
-                   $type_func, "\\\\fB\$1\\\\fP",
-                   $type_struct, "\\\\fB\$1\\\\fP",
-                   $type_param, "\\\\fI\$1\\\\fP" );
address@hidden = ( [$type_constant, '"\\\fB$1\\\fP"'],
+                   [$type_func, '"\\\fB$1\\\fP"'],
+                   [$type_struct, '"\\\fB$1\\\fP"'],
+                   [$type_param, '" \\\fI$1\\\fP "'] );
 $blankline_man = "";
 
 # text-mode
-%highlights_text = ( $type_constant, "\$1",
-                    $type_func, "\$1",
-                    $type_struct, "\$1",
-                    $type_param, "\$1" );
address@hidden = ( [$type_constant, '"$1"'],
+                    [$type_func, '"$1"'],
+                    [$type_struct, '"$1"'],
+                    [$type_param, '"$1 "'] );
 $blankline_text = "";
-
+my $lineprefix = "";
 
 sub usage {
     print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man | -tex | 
-texinfo  -listfunc ]\n";
@@ -204,7 +207,7 @@ if ($#ARGV==-1) {
 
 $verbose = 0;
 $output_mode = "man";
-%highlights = %highlights_man;
address@hidden = @highlights_man;
 $blankline = $blankline_man;
 $modulename = "API Documentation";
 $sourceversion = strftime "%Y-%m-%d", localtime;
@@ -213,27 +216,27 @@ while ($ARGV[0] =~ m/^-(.*)/) {
     $cmd = shift @ARGV;
     if ($cmd eq "-html") {
        $output_mode = "html";
-       %highlights = %highlights_html;
+       @highlights = @highlights_html;
        $blankline = $blankline_html;
     } elsif ($cmd eq "-man") {
        $output_mode = "man";
-       %highlights = %highlights_man;
+       @highlights = @highlights_man;
        $blankline = $blankline_man;
     } elsif ($cmd eq "-tex") {
        $output_mode = "tex";
-       %highlights = %highlights_tex;
+       @highlights = @highlights_tex;
        $blankline = $blankline_tex;
     } elsif ($cmd eq "-texinfo") {
        $output_mode = "texinfo";
-       %highlights = %highlights_texinfo;
+       @highlights = @highlights_texinfo;
        $blankline = $blankline_texinfo;
     } elsif ($cmd eq "-text") {
        $output_mode = "text";
-       %highlights = %highlights_text;
+       @highlights = @highlights_text;
        $blankline = $blankline_text;
     } elsif ($cmd eq "-docbook") {
        $output_mode = "sgml";
-       %highlights = %highlights_sgml;
+       @highlights = @highlights_sgml;
        $blankline = $blankline_sgml;
     } elsif ($cmd eq "-listfunc") {
        $output_mode = "listfunc";
@@ -273,6 +276,8 @@ sub dump_section {
     my $name = shift @_;
     my $contents = join "\n", @_;
 
+    $name = " $name";
+
     if ($name =~ m/$type_constant/) {
        $name = $1;
 #      print STDERR "constant section '$1' = '$contents'\n";
@@ -283,6 +288,7 @@ sub dump_section {
        $parameters{$name} = $contents;
     } else {
 #      print STDERR "other section '$name' = '$contents'\n";
+       $name =~ tr/ //d;
        $sections{$name} = $contents;
        push @sectionlist, $name;
     }
@@ -297,37 +303,17 @@ sub dump_section {
 #  parameters => %parameter descriptions
 #  sectionlist => @list of sections
 #  sections => %descriont descriptions
-#  
-
-sub repstr {
-    $pattern = shift;
-    $repl = shift;
-    $match1 = shift;
-    $match2 = shift;
-    $match3 = shift;
-    $match4 = shift;
-
-    $output = $repl;
-    $output =~ s,\$1,$match1,g;
-    $output =~ s,\$2,$match2,g;
-    $output =~ s,\$3,$match3,g;
-    $output =~ s,\$4,$match4,g;
-
-    eval "\$return = qq/$output/";
-
-#    print "pattern $pattern matched 1=$match1 2=$match2 3=$match3 4=$match4 
replace $repl yielded $output interpolated $return\n";
-
-    $return;
-}
+#
 
 sub just_highlight {
     my $contents = join "\n", @_;
     my $line;
     my $ret = "";
 
-    foreach $pattern (keys %highlights) {
-#      print "scanning pattern $pattern ($highlights{$pattern})\n";
-       $contents =~ s:$pattern:repstr($pattern, $highlights{$pattern}, $1, $2, 
$3, $4):gse;
+    foreach $highlight (@highlights) {
+       my ($pattern, $replace) = @$highlight;
+       #print "scanning pattern $pattern ($replace)\n";
+       $contents =~ s/$pattern/$replace/gees;
     }
     foreach $line (split "\n", $contents) {
        if ($line eq ""){
@@ -373,13 +359,45 @@ sub output_texinfo {
        }
     }
     foreach $section (@{$args{'sectionlist'}}) {
+       $section =~ s/\@//g;
        print "address@hidden:} " if $section ne $section_default;
-       $args{'sections'}{$section} =~ s:([{}]):address@hidden:gs;
+       $args{'sections'}{$section} =~ s:([{}]):address@hidden:gs;
        output_highlight($args{'sections'}{$section});
     }
     print "address@hidden deftypefun\n\n";
 }
 
+sub output_enum_texinfo {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+    my $name = $args{'enum'};
+    my $param;
+    my $param2;
+    my $sec;
+    my $check;
+    my $type;
+
+    print "address@hidden $name\n";
+    print "address@hidden address@hidden";
+
+    $check=0;
+    foreach $parameter (@{$args{'parameterlist'}}) {
+        $param1 = $parameter;
+       $param1 =~ s/_/address@hidden/g;
+
+       $check = 1;
+       print "address@hidden ".$param1."\n";
+#      print "\n";
+
+        $param2 = $args{'parameters'}{$parameter};
+       $out = just_highlight($param2);
+       chomp $out;
+       print $out . "\n";
+    }
+    print "address@hidden table\n";
+}
+
 # output in html
 sub output_html {
     my %args = %{$_[0]};
@@ -431,7 +449,9 @@ sub output_tex {
 
     $func =~ s/_/\\_/g;
 
-    print "\n\n\\subsection{". $func . "}\n\\label{" . $args{'function'} . 
"}\n";
+    print "\n\n\\begin{function}\n";
+    print "\\functionTitle{". $func . "}\n";
+    print "\\index{". $func . "}\n";
 
     $type = $args{'functiontype'};
     $type =~ s/_/\\_/g;
@@ -454,9 +474,8 @@ sub output_tex {
     }
     print ")\n";
 
-    print "\n{\\large{Arguments}}\n";
+    print "\n\\begin{functionArguments}\n";
 
-    print "\\begin{itemize}\n";
     $check=0;
     foreach $parameter (@{$args{'parameterlist'}}) {
         $param1 = $args{'parametertypes'}{$parameter};
@@ -465,11 +484,12 @@ sub output_tex {
        $param2 =~ s/_/\\_/g;
 
        $check = 1;
-       print "\\item {\\it ".$param1."} {\\bf ".$param2."}: \n";
+       print "\\functionArgument {\\it ".$param1."} {\\bf ".$param2."}: \n";
 #      print "\n";
 
        $param3 = $args{'parameters'}{$parameter};
-       $param3 =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
+       $param3 =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
+       $param3 =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
 
        $out = just_highlight($param3);
        $out =~ s/_/\\_/g;
@@ -478,31 +498,72 @@ sub output_tex {
     if ($check==0) {
        print "\\item void\n";
     }
-    print "\\end{itemize}\n";
+    print "\\end{functionArguments}\n";
 
     foreach $section (@{$args{'sectionlist'}}) {
        $sec = $section;
        $sec =~ s/_/\\_/g;
-       $sec =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
+       $sec =~ s/#([a-zA-Z\_]+)/{\\it $1}/g;
+
+       print "\n\\begin{function${sec}}\n";
+       $out = $args{'sections'}{$section};
+
+       $out =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
+       $out =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
+       $out =~ s/\@([a-zA-Z\_]+)/{\\bf $1}/g;
+       $out =~ s/_/\\_\\-/g;
+        $out =~ s/\$/\\\$/g;
+       $out =~ s/#/\\#/g;
+       $out =~ s/\n\n/\n/g;
+       $out =~ s/\\:/:/g;
+       $out =~ s/\-\>/\$\\rightarrow\$/g;
+       $out =~ s/([0-9]+)\^([0-9]+)/\$\{$1\}\^\{$2\}\$/g;
+
+       print $out;
+       print "\\end{function${sec}}\n";
+    }
+    print "\\end{function}\n\n";
+}
 
-       print "\n{\\large{$sec}}\\\\\n";
-       print "\\begin{rmfamily}\n";
+sub output_enum_tex {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+    my $name = $args{'enum'};
+    my $param;
+    my $param2;
+    my $sec;
+    my $check;
+    my $type;
 
-       $sec = $args{'sections'}{$section};
-       $sec =~ s/\\:/:/g;
-       $sec =~ s/#([a-zA-Z\_]+)/{\\it \1}/g;
-       $sec =~ s/->/\$\\rightarrow\$/g;
-       $sec =~ s/([0-9]+)\^([0-9]+)/\$\{\1\}\^\{\2\}\$/g;
+    print "\n\n\\begin{enum}\n";
+    $name =~ s/_/\\_/g;
+    print "\\enumTitle{". $name . "}\n";
+    print "\\index{". $name . "}\n";
 
-       $out = just_highlight($sec);
-       $out =~ s/_/\\_/g;
+    print "\n\\begin{enumList}\n";
 
-       print $out;
-       print "\\end{rmfamily}\n";
+    $check=0;
+    foreach $parameter (@{$args{'parameterlist'}}) {
+        $param1 = $parameter;
+       $param1 =~ s/_/\\_\\-/g;
+
+       $check = 1;
+       print "\\enumElement{".$param1."}{";
+#      print "\n";
+
+        $param2 = $args{'parameters'}{$parameter};
+       $param2 =~ s/\#([a-zA-Z\_]+)/{\\it $1}/g;
+       $param2 =~ s/\%([a-zA-Z\_]+)/{\\bf $1}/g;
+       $out = just_highlight($param2);
+       $out =~ s/_/\\_/g;
+       chomp $out;
+       print $out . "}\n";
     }
-    print "\n";
-}
+    print "\\end{enumList}\n";
 
+    print "\\end{enum}\n\n";
+}
 
 # output in sgml DocBook
 sub output_sgml {
@@ -642,11 +703,14 @@ sub output_man {
     if ($args{'bugsto'}) {
        print ".SH \"REPORTING BUGS\"\n";
        print "Report bugs to <". $args{'bugsto'} . ">.\n";
+        print ".br\n";
+       print "General guidelines for reporting bugs: 
http://www.gnu.org/gethelp/\n";;
+        print ".br\n";
        if ($args{'pkgname'}) {
            print $args{'pkgname'} . " home page: " .
                "http://www.gnu.org/software/"; . $args{'module'} . "/\n";
        }
-       print "General help using GNU software: http://www.gnu.org/gethelp/\n";;
+       print "\n";
     }
 
     if ($args{'copyright'}) {
@@ -673,6 +737,10 @@ sub output_man {
        print ".B info " . $args{'seeinfo'} . "\n";
        print ".PP\n";
        print "should give you access to the complete manual.\n";
+       print "As an alternative you may obtain the manual from:\n";
+       print ".IP\n";
+       print ".B http://www.gnu.org/software/"; . $args{'module'} . 
"/manual/\n";
+       print ".PP\n";
     }
 }
 
@@ -708,6 +776,10 @@ sub output_function {
     eval "output_".$output_mode."(address@hidden);";
 }
 
+sub output_enum {
+    eval "output_enum_".$output_mode."(address@hidden);";
+}
+
 
 ##
 # takes a function prototype and spits out all the details
@@ -747,7 +819,7 @@ sub dump_function {
 #          print STDERR " :> @args\n";
            $type = join " ", @args;
 
-           if ($parameters{$param} eq "" && $param != "void") {
+           if ((!defined($parameters{$param}) || $parameters{$param} eq "") && 
$param ne "void") {
                $parameters{$param} = "-- undescribed --";
                print STDERR "warning: $lineno: Function parameter '$param' not 
described in '$function_name'\n";
            }
@@ -758,7 +830,7 @@ sub dump_function {
 #          print STDERR "param = '$param', type = '$type'\n";
        }
     } else {
-       print STDERR "warning: $lineno: Cannot understand prototype: 
'$prototype'\n";
+       print STDERR "warning: $lineno: Cannot understand prototype: 
'$prototype'\n" if (!($prototype  =~ m,GSASL_VALID_MECHANISM_CHARACTERS,));
        return;
     }
 
@@ -784,6 +856,56 @@ sub dump_function {
     }
 }
 
+sub dump_enum {
+    my $prototype = shift @_;
+
+    if (($prototype =~ 
m/^\s*typedef\s+enum\s*[a-zA-Z0-9_~:]*\s*\{([\-a-zA-Z0-9_~=,:\s\(\)\<]+)\s*\}\s*([a-zA-Z0-9_]+);.*/))
 {
+#        || $prototype =~ m/^\s*enum\s+([a-zA-Z0-9_~:]+).*/) {
+        $args = $1;
+       $name = $2;
+
+       foreach $arg (split ',', $args) {
+           # strip leading/trailing spaces
+           $arg =~ s/^\s*//;
+           $arg =~ s/\s*$//;
+           $arg =~ s/([A-Za-z0-9_]+)\s*=.*/$1/g;
+#          print STDERR "SCAN ARG: '$arg'\n";
+
+            next if $arg eq '';
+           if ((!defined($parameters{$arg}) || $parameters{$arg} eq "")) {
+               $parameters{$arg} = "-- undescribed --";
+               print STDERR "warning: $lineno: Enumeration parameter '$arg' 
not described in '$name'\n";
+           }
+
+           push @parameterlist, $arg;
+
+#          print STDERR "param = '$arg'\n";
+       }
+    } else {
+#      print STDERR "warning: $lineno: Cannot understand enumeration: 
'$prototype'\n";
+       return;
+    }
+
+    output_enum({'enum' => $name,
+                        'module' => $modulename,
+                        'sourceversion' => $sourceversion,
+                        'include' => $include,
+                        'includefuncprefix' => $includefuncprefix,
+                        'bugsto' => $bugsto,
+                        'pkgname' => $pkgname,
+                        'copyright' => $copyright,
+                        'verbatimcopying' => $verbatimcopying,
+                        'seeinfo' => $seeinfo,
+                        'functiontype' => $return_type,
+                        'parameterlist' => address@hidden,
+                        'parameters' => \%parameters,
+                        'parametertypes' => \%parametertypes,
+                        'sectionlist' => address@hidden,
+                        'sections' => \%sections,
+                        'purpose' => $function_purpose
+                        });
+}
+
 ######################################################################
 # main
 # states
@@ -800,7 +922,7 @@ $doc_start = "^/\\*\\*\$";
 $doc_end = "\\*/";
 $doc_com = "\\s*\\*\\s*";
 $doc_func = $doc_com."(\\w+):?";
-$doc_sect = $doc_com."([".$doc_special."[:upper:]][\\w ]+):\\s*(.*)";
+$doc_sect = $doc_com."([".$doc_special."[:upper:]][\\w]+):\\s*(.*)";
 $doc_content = $doc_com."(.*)";
 
 %constants = ();
@@ -812,25 +934,30 @@ $doc_content = $doc_com."(.*)";
 $contents = "";
 $section_default = "Description";      # default section
 $section = $section_default;
+$enum = 0;
 
 $lineno = 0;
+
 foreach $file (@ARGV) {
     if (!open(IN,"<$file")) {
        print STDERR "Error: Cannot open file $file\n";
        next;
     }
-    while (<IN>) {
+    while ($line = <IN>) {
        $lineno++;
 
        if ($state == 0) {
-           if (/$doc_start/o) {
+           if ($line =~ /$doc_start/o) {
                $state = 1;             # next line is always the function name
+#          print STDERR "XXX: start of doc comment\n";
            }
        } elsif ($state == 1) { # this line is the function name (always)
-           if (/$doc_func/o) {
+           if ($line =~ /$doc_func/o) {
                $function = $1;
                $state = 2;
-               if (/-\s*(.*)/) {
+#          print STDERR "XXX: start of doc comment, looking for prototype\n";
+
+               if ($line =~ /-\s*(.*)/) {
                    $function_purpose = $1;
                } else {
                    $function_purpose = "";
@@ -844,11 +971,11 @@ foreach $file (@ARGV) {
                $state = 0;
            }
        } elsif ($state == 2) { # look for head: lines, and include content
-           if (/$doc_sect/o) {
+           if ($line =~ /$doc_sect/o) {
                $newsection = $1;
                $newcontents = $2;
 
-               if ($contents ne "") {
+               if ($contents ne '') {
                    dump_section($section, $contents);
                    $section = $section_default;
                }
@@ -858,7 +985,7 @@ foreach $file (@ARGV) {
                    $contents .= "\n";
                }
                $section = $newsection;
-           } elsif (/$doc_end/) {
+           } elsif ($line =~ /$doc_end/) {
 
                if ($contents ne "") {
                    dump_section($section, $contents);
@@ -866,13 +993,12 @@ foreach $file (@ARGV) {
                    $contents = "";
                }
 
-#          print STDERR "end of doc comment, looking for prototype\n";
-               $prototype = "";
+               $prototype = '';
                $state = 3;
-           } elsif (/$doc_content/) {
+           } elsif ($line =~ /$doc_content/) {
                # miguel-style comment kludge, look for blank lines after
                # @parameter line to signify start of description
-               if ($1 eq "" && $section =~ m/^@/) {
+               if ($1 eq '' && $section =~ m/^@/) {
                    dump_section($section, $contents);
                    $section = $section_default;
                    $contents = "";
@@ -884,16 +1010,25 @@ foreach $file (@ARGV) {
                print STDERR "warning: $lineno: Bad line: $_";
            }
        } elsif ($state == 3) { # scanning for function { (end of prototype)
-           if (m#\s*/\*\s+MACDOC\s*#io) {
+           if ($line =~ /([a-zA-Z\s]+)enum(.*)$/) {
+               $enum = 1;
+           }
+
+           if ($line =~ m#\s*/\*\s+MACDOC\s*#io) {
              # do nothing
            }
-           elsif (/([^\{]*)/) {
+           elsif ($enum == 1 && $line =~ /(\s*\{).*/) {
+               $prototype = "typedef enum {";
+           }
+           elsif ($line =~ /([^\{]*)/) {
                $prototype .= $1;
            }
-           if (/\{/) {
+
+           if ($enum == 0 && $line =~ /;/) {
                $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
                $prototype =~ address@hidden@ @gos; # strip newlines/cr's.
                $prototype =~ address@hidden +@@gos; # strip leading spaces
+
                dump_function($prototype);
 
                $function = "";
@@ -904,9 +1039,31 @@ foreach $file (@ARGV) {
                %sections = ();
                @sectionlist = ();
                $prototype = "";
+               $enum = 0;
 
                $state = 0;
            }
+           elsif ($enum == 1 && $line =~ /\}/) {
+               $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
+               $prototype =~ address@hidden@ @gos; # strip newlines/cr's.
+               $prototype =~ address@hidden +@@gos; # strip leading spaces
+
+               dump_enum($prototype);
+
+               $function = "";
+               %constants = ();
+               %parameters = ();
+               %parametertypes = ();
+               @parameterlist = ();
+               %sections = ();
+               @sectionlist = ();
+               $prototype = "";
+               $enum = 0;
+
+               $state = 0;
+           }
+
        }
     }
+
 }
diff --git a/doc/gdoc.mk b/doc/gdoc.mk
index 2d91b99..bbddbd3 100644
--- a/doc/gdoc.mk
+++ b/doc/gdoc.mk
@@ -1,5 +1,5 @@
 # -*- makefile -*-
-# Copyright (C) 2002-2014 Simon Josefsson
+# Copyright (C) 2002-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/doc/gendocs_template b/doc/gendocs_template
index 50f4778..d6e89b1 100644
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -99,7 +99,7 @@ the FSF.  Broken links and other corrections or suggestions 
can be sent
 to <a href="mailto:%%EMAIL%%";>&lt;%%EMAIL%%&gt;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
diff --git a/doc/gendocs_template b/doc/gendocs_template_min
similarity index 63%
copy from doc/gendocs_template
copy to doc/gendocs_template_min
index 50f4778..fe9c07e 100644
--- a/doc/gendocs_template
+++ b/doc/gendocs_template_min
@@ -1,11 +1,27 @@
-<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en">
+
+<head>
 <title>%%TITLE%% - GNU Project - Free Software Foundation</title>
-<!--#include virtual="/server/banner.html" -->
-<h2>%%TITLE%%</h2>
+<meta http-equiv="content-type" content='text/html; charset=utf-8' />
+<link rel="stylesheet" type="text/css" href="/gnu.css" />
+</head>
+
+<body>
+
+<h3>%%TITLE%%</h3>
 
 <address>Free Software Foundation</address>
 <address>last updated %%DATE%%</address>
+<p>
+<a href="/graphics/gnu-head.jpg">
+       <img src="/graphics/gnu-head-sm.jpg"
+             alt=" [image of the head of a GNU] " width="129" height="122"/>
+</a>
+</p>
+<hr />
 
 <p>This manual (%%PACKAGE%%) is available in the following formats:</p>
 
@@ -52,45 +68,10 @@
     (%%TEXI_TGZ_SIZE%%K bytes gzipped tar file).</a></li>
 </ul>
 
-<p>You can <a href="http://shop.fsf.org/";>buy printed copies of
-some manuals</a> (among other items) from the Free Software Foundation;
-this helps support FSF activities.</p>
-
-<p>The manual is also available in a few experimental formats:
-
-<p>
-<ul>
-  <li><a href="../doxygen/">Doxygen HTML</a>.
-  <li><a href="../doxygen/libidn.pdf">Doxygen PDF file</a>.
-</ul>
-
-<p>
-<ul>
-  <li><a href="../reference/ch01.html">GTK-DOC HTML C/C++ API Reference 
Manual</a>.
-  <li><a href="../reference/%%PACKAGE%%.pdf">PDF Reference API Manual 
(GTK-DOC)</a>.
-  <li><a href="../reference/libidn.devhelp2">DevHelp C/C++ API Reference 
Manual</a>.
-</ul>
-
-<p>The native Java implementation is documented using Javadoc:
-
-<p>
-<ul>
-  <li><a href="../javadoc/">JavaDoc HTML</a>.
-</ul>
-
 <p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%%
 script</a>.)</p>
 
-<!-- If needed, change the copyright block at the bottom. In general,
-     all pages on the GNU web server should have the section about
-     verbatim copying.  Please do NOT remove this without talking
-     with the webmasters first.
-     Please make sure the copyright date is consistent with the document
-     and that it is like this: "2001, 2002", not this: "2001-2002". -->
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
-<div id="footer">
-<div class="unprintable">
+<div id="footer" class="copyright">
 
 <p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
@@ -99,7 +80,7 @@ the FSF.  Broken links and other corrections or suggestions 
can be sent
 to <a href="mailto:%%EMAIL%%";>&lt;%%EMAIL%%&gt;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
@@ -108,6 +89,5 @@ Commons Attribution-NoDerivs 3.0 United States 
License</a>.</p>
 <!--#include virtual="/server/bottom-notes.html" -->
 
 </div>
-</div>
 </body>
 </html>
diff --git a/doc/java/Makefile.am b/doc/java/Makefile.am
index 5ea01b3..6127d16 100644
--- a/doc/java/Makefile.am
+++ b/doc/java/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Simon Josefsson
+# Copyright (C) 2004-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/doc/libidn.texi b/doc/libidn.texi
index 02484c7..64772d1 100644
--- a/doc/libidn.texi
+++ b/doc/libidn.texi
@@ -14,7 +14,7 @@
 This manual is last updated @value{UPDATED} for version
 @value{VERSION} of GNU Libidn.
 
-Copyright @copyright{} 2002-2014 Simon Josefsson.
+Copyright @copyright{} 2002-2015 Simon Josefsson.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/specifications/punycode-spec.gz 
b/doc/specifications/punycode-spec.gz
new file mode 100644
index 0000000..5c60a9a
Binary files /dev/null and b/doc/specifications/punycode-spec.gz differ
diff --git a/doc/tld/Makefile.am b/doc/tld/Makefile.am
index f894553..1889d96 100644
--- a/doc/tld/Makefile.am
+++ b/doc/tld/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Simon Josefsson.
+# Copyright (C) 2004-2015 Simon Josefsson.
 # Copyright (C) 2004  Free Software Foundation, Inc
 #
 # This file is part of GNU Libidn.
diff --git a/doc/tld/README b/doc/tld/README
index c134f41..16d8b12 100644
--- a/doc/tld/README
+++ b/doc/tld/README
@@ -1,5 +1,5 @@
 Libidn doc/tld/README -- Notes and definition of the TLD tables.
-Copyright (C) 2004-2014 Simon Josefsson
+Copyright (C) 2004-2015 Simon Josefsson
 Copyright (C) 2004  Free Software Foundation, Inc
 See the end for copying conditions.
 
diff --git a/doc/tld/fr.tld b/doc/tld/fr.tld
index 8965578..d31b401 100644
--- a/doc/tld/fr.tld
+++ b/doc/tld/fr.tld
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2014 Simon Josefsson
+# Copyright (C) 2004-2015 Simon Josefsson
 # Copyright (C) 2003 Stephane Bortzmeyer <address@hidden> / AFNIC
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/doc/tld/no.tld b/doc/tld/no.tld
index b64af2d..88b3925 100644
--- a/doc/tld/no.tld
+++ b/doc/tld/no.tld
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2015 Free Software Foundation, Inc.
 # Author: Thomas Jacob, Internet24.de.
 
 # Copying and distribution of this file, with or without modification,
diff --git a/examples/Makefile.am b/examples/Makefile.am
index fbfd505..f329509 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002-2014 Simon Josefsson.
+# Copyright (C) 2002-2015 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/examples/README b/examples/README
index c351edc..ada8c1c 100644
--- a/examples/README
+++ b/examples/README
@@ -1,5 +1,5 @@
 Libidn examples/README -- Information about files in examples/ directory.
-Copyright (C) 2003-2014 Simon Josefsson
+Copyright (C) 2003-2015 Simon Josefsson
 See the end for copying conditions.
 
 This directory contains examples on how to use Libidn.
diff --git a/examples/example.c b/examples/example.c
index 05453be..b63e59c 100644
--- a/examples/example.c
+++ b/examples/example.c
@@ -1,5 +1,5 @@
 /* example.c --- Example code showing how to use stringprep().
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/examples/example2.c b/examples/example2.c
index a4815b1..2cc07b4 100644
--- a/examples/example2.c
+++ b/examples/example2.c
@@ -1,5 +1,5 @@
 /* example2.c --- Example code showing how to use punycode.
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  * Copyright (C) 2002  Adam M. Costello
  *
  * This file is part of GNU Libidn.
diff --git a/examples/example3.c b/examples/example3.c
index d7bace2..c6a8f6d 100644
--- a/examples/example3.c
+++ b/examples/example3.c
@@ -1,5 +1,5 @@
 /* example3.c --- Example ToASCII() code showing how to use Libidn.
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/examples/example4.c b/examples/example4.c
index 7802459..c782a74 100644
--- a/examples/example4.c
+++ b/examples/example4.c
@@ -1,5 +1,5 @@
 /* example4.c --- Example ToUnicode() code showing how to use Libidn.
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/examples/example5.c b/examples/example5.c
index 120e487..79c1d32 100644
--- a/examples/example5.c
+++ b/examples/example5.c
@@ -1,5 +1,5 @@
 /* example5.c --- Example TLD checking.
- * Copyright (C) 2004-2014 Simon Josefsson
+ * Copyright (C) 2004-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/gl/Makefile.am b/gl/Makefile.am
index a0f249a..2b4c4ed 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 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
@@ -331,6 +331,7 @@ stddef.h: stddef.in.h $(top_builddir)/config.status
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
+             -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \
              -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
              -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
              < $(srcdir)/stddef.in.h; \
@@ -748,9 +749,11 @@ unistd.h: unistd.in.h $(top_builddir)/config.status 
$(CXXDEFS_H) $(ARG_NONNULL_H
              -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
              -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
              -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
+             -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
              -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
              -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
              -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
+             -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
              -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \
              -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \
              -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \
diff --git a/gl/errno.in.h b/gl/errno.in.h
index 832afc8..affbb97 100644
--- a/gl/errno.in.h
+++ b/gl/errno.in.h
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/gl/error.c b/gl/error.c
index 7b99cd7..6683197 100644
--- a/gl/error.c
+++ b/gl/error.c
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2015 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
@@ -75,7 +75,7 @@ extern void __error (int status, int errnum, const char 
*message, ...)
 extern void __error_at_line (int status, int errnum, const char *file_name,
                              unsigned int line_number, const char *message,
                              ...)
-     __attribute__ ((__format__ (__printf__, 5, 6)));;
+     __attribute__ ((__format__ (__printf__, 5, 6)));
 # define error __error
 # define error_at_line __error_at_line
 
diff --git a/gl/error.h b/gl/error.h
index 4aaafb3..ccffef5 100644
--- a/gl/error.h
+++ b/gl/error.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2014 Free Software Foundation,
+   Copyright (C) 1995-1997, 2003, 2006, 2008-2015 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
diff --git a/gl/getopt.c b/gl/getopt.c
index 7d950af..212cbf7 100644
--- a/gl/getopt.c
+++ b/gl/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 address@hidden
    before changing it!
-   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2014 Free Software
+   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2015 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -487,7 +487,20 @@ _getopt_internal_r (int argc, char **argv, const char 
*optstring,
         const struct option *p;
         struct option_list *next;
       } *ambig_list = NULL;
+#ifdef _LIBC
+/* malloc() not used for _LIBC to simplify failure messages.  */
+# define free_option_list(l)
+#else
+# define free_option_list(l)                   \
+      while (l != NULL)                                \
+        {                                      \
+          struct option_list *pn = l->next;    \
+          free (l);                            \
+          l = pn;                              \
+        }
+#endif
       int exact = 0;
+      int ambig = 0;
       int indfound = -1;
       int option_index;
 
@@ -514,22 +527,37 @@ _getopt_internal_r (int argc, char **argv, const char 
*optstring,
                 pfound = p;
                 indfound = option_index;
               }
+            else if (ambig)
+              ; /* Taking simpler path to handling ambiguities.  */
             else if (long_only
                      || pfound->has_arg != p->has_arg
                      || pfound->flag != p->flag
                      || pfound->val != p->val)
               {
                 /* Second or later nonexact match found.  */
+#ifdef _LIBC
+                struct option_list *newp = alloca (sizeof (*newp));
+#else
                 struct option_list *newp = malloc (sizeof (*newp));
-                newp->p = p;
-                newp->next = ambig_list;
-                ambig_list = newp;
+                if (newp == NULL)
+                  {
+                    free_option_list (ambig_list);
+                    ambig_list = NULL;
+                    ambig = 1; /* Use simpler fallback message.  */
+                  }
+                else
+#endif
+                  {
+                    newp->p = p;
+                    newp->next = ambig_list;
+                    ambig_list = newp;
+                  }
               }
           }
 
-      if (ambig_list != NULL && !exact)
+      if ((ambig || ambig_list) && !exact)
         {
-          if (print_errors)
+          if (print_errors && ambig_list)
             {
               struct option_list first;
               first.p = pfound;
@@ -585,18 +613,20 @@ _getopt_internal_r (int argc, char **argv, const char 
*optstring,
               fputc ('\n', stderr);
 #endif
             }
+          else if (print_errors && ambig)
+            {
+              fprintf (stderr,
+                       _("%s: option '%s' is ambiguous\n"),
+                       argv[0], argv[d->optind]);
+            }
           d->__nextchar += strlen (d->__nextchar);
           d->optind++;
           d->optopt = 0;
+          free_option_list (ambig_list);
           return '?';
         }
 
-      while (ambig_list != NULL)
-        {
-          struct option_list *pn = ambig_list->next;
-          free (ambig_list);
-          ambig_list = pn;
-        }
+      free_option_list (ambig_list);
 
       if (pfound != NULL)
         {
diff --git a/gl/getopt.in.h b/gl/getopt.in.h
index 7ab99fb..9248f76 100644
--- a/gl/getopt.in.h
+++ b/gl/getopt.in.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2014 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2015 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gl/getopt1.c b/gl/getopt1.c
index a184865..2b1feb6 100644
--- a/gl/getopt1.c
+++ b/gl/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-2014 Free Software
+   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2015 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gl/getopt_int.h b/gl/getopt_int.h
index 24ed672..e893a6e 100644
--- a/gl/getopt_int.h
+++ b/gl/getopt_int.h
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2014 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2015 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gl/gettext.h b/gl/gettext.h
index babf1d0..c05cc94 100644
--- a/gl/gettext.h
+++ b/gl/gettext.h
@@ -1,5 +1,5 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2015 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gl/intprops.h b/gl/intprops.h
index d0bb7a6..f85ccad 100644
--- a/gl/intprops.h
+++ b/gl/intprops.h
@@ -1,6 +1,6 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2005, 2009-2015 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/gl/m4/00gnulib.m4 b/gl/m4/00gnulib.m4
index 8eca551..c7103ed 100644
--- a/gl/m4/00gnulib.m4
+++ b/gl/m4/00gnulib.m4
@@ -1,5 +1,5 @@
 # 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/absolute-header.m4 b/gl/m4/absolute-header.m4
index ce3e39e..bc19dfc 100644
--- a/gl/m4/absolute-header.m4
+++ b/gl/m4/absolute-header.m4
@@ -1,5 +1,5 @@
 # absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/alloca.m4 b/gl/m4/alloca.m4
index d7bdea6..8408bed 100644
--- a/gl/m4/alloca.m4
+++ b/gl/m4/alloca.m4
@@ -1,5 +1,5 @@
 # alloca.m4 serial 14
-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2014 Free Software Foundation,
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2015 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gl/m4/autobuild.m4 b/gl/m4/autobuild.m4
index 00d8709..239809c 100644
--- a/gl/m4/autobuild.m4
+++ b/gl/m4/autobuild.m4
@@ -1,5 +1,5 @@
 # autobuild.m4 serial 7
-dnl Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/close.m4 b/gl/m4/close.m4
index 68510c5..d04aefb 100644
--- a/gl/m4/close.m4
+++ b/gl/m4/close.m4
@@ -1,5 +1,5 @@
 # close.m4 serial 8
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/csharp.m4 b/gl/m4/csharp.m4
index 20f7887..8d90a65 100644
--- a/gl/m4/csharp.m4
+++ b/gl/m4/csharp.m4
@@ -1,5 +1,5 @@
 # csharp.m4 serial 3
-dnl Copyright (C) 2004-2005, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/csharpcomp.m4 b/gl/m4/csharpcomp.m4
index 4a91bc0..5308f9d 100644
--- a/gl/m4/csharpcomp.m4
+++ b/gl/m4/csharpcomp.m4
@@ -1,5 +1,5 @@
 # csharpcomp.m4 serial 8
-dnl Copyright (C) 2003-2005, 2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2007, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/csharpexec.m4 b/gl/m4/csharpexec.m4
index 73597cc..50fd281 100644
--- a/gl/m4/csharpexec.m4
+++ b/gl/m4/csharpexec.m4
@@ -1,5 +1,5 @@
 # csharpexec.m4 serial 4
-dnl Copyright (C) 2003-2005, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/dup2.m4 b/gl/m4/dup2.m4
index 6498fc2..59028e0 100644
--- a/gl/m4/dup2.m4
+++ b/gl/m4/dup2.m4
@@ -1,5 +1,5 @@
-#serial 20
-dnl Copyright (C) 2002, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+#serial 24
+dnl Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,7 +8,6 @@ AC_DEFUN([gl_FUNC_DUP2],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CHECK_FUNCS_ONCE([getdtablesize])
   m4_ifdef([gl_FUNC_DUP2_OBSOLETE], [
     AC_CHECK_FUNCS_ONCE([dup2])
     if test $ac_cv_func_dup2 = no; then
@@ -20,38 +19,50 @@ AC_DEFUN([gl_FUNC_DUP2],
   if test $HAVE_DUP2 = 1; then
     AC_CACHE_CHECK([whether dup2 works], [gl_cv_func_dup2_works],
       [AC_RUN_IFELSE([
-         AC_LANG_PROGRAM([[#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>]],
-           [int result = 0;
-#ifdef HAVE_GETDTABLESIZE
-            int bad_fd = getdtablesize ();
-#else
-            int bad_fd = 1000000;
-#endif
-#ifdef FD_CLOEXEC
-            if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1)
-              result |= 1;
-#endif
-            if (dup2 (1, 1) == 0)
-              result |= 2;
-#ifdef FD_CLOEXEC
-            if (fcntl (1, F_GETFD) != FD_CLOEXEC)
-              result |= 4;
-#endif
-            close (0);
-            if (dup2 (0, 0) != -1)
-              result |= 8;
-            /* Many gnulib modules require POSIX conformance of EBADF.  */
-            if (dup2 (2, bad_fd) == -1 && errno != EBADF)
-              result |= 16;
-            /* Flush out some cygwin core dumps.  */
-            if (dup2 (2, -1) != -1 || errno != EBADF)
-              result |= 32;
-            dup2 (2, 255);
-            dup2 (2, 256);
-            return result;
-           ])
+         AC_LANG_PROGRAM(
+           [[#include <errno.h>
+             #include <fcntl.h>
+             #include <limits.h>
+             #include <sys/resource.h>
+             #include <unistd.h>
+             #ifndef RLIM_SAVED_CUR
+             # define RLIM_SAVED_CUR RLIM_INFINITY
+             #endif
+             #ifndef RLIM_SAVED_MAX
+             # define RLIM_SAVED_MAX RLIM_INFINITY
+             #endif
+           ]],
+           [[int result = 0;
+             int bad_fd = INT_MAX;
+             struct rlimit rlim;
+             if (getrlimit (RLIMIT_NOFILE, &rlim) == 0
+                 && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX
+                 && rlim.rlim_cur != RLIM_INFINITY
+                 && rlim.rlim_cur != RLIM_SAVED_MAX
+                 && rlim.rlim_cur != RLIM_SAVED_CUR)
+               bad_fd = rlim.rlim_cur;
+             #ifdef FD_CLOEXEC
+               if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1)
+                 result |= 1;
+             #endif
+             if (dup2 (1, 1) != 1)
+               result |= 2;
+             #ifdef FD_CLOEXEC
+               if (fcntl (1, F_GETFD) != FD_CLOEXEC)
+                 result |= 4;
+             #endif
+             close (0);
+             if (dup2 (0, 0) != -1)
+               result |= 8;
+             /* Many gnulib modules require POSIX conformance of EBADF.  */
+             if (dup2 (2, bad_fd) == -1 && errno != EBADF)
+               result |= 16;
+             /* Flush out some cygwin core dumps.  */
+             if (dup2 (2, -1) != -1 || errno != EBADF)
+               result |= 32;
+             dup2 (2, 255);
+             dup2 (2, 256);
+             return result;]])
         ],
         [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no],
         [case "$host_os" in
@@ -59,15 +70,14 @@ AC_DEFUN([gl_FUNC_DUP2],
              gl_cv_func_dup2_works="guessing no" ;;
            cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
              gl_cv_func_dup2_works="guessing no" ;;
-           linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
-                   # closed fd may yield -EBADF instead of -1 / errno=EBADF.
-             gl_cv_func_dup2_works="guessing no" ;;
            aix* | freebsd*)
                    # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
                    # not EBADF.
              gl_cv_func_dup2_works="guessing no" ;;
            haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC.
              gl_cv_func_dup2_works="guessing no" ;;
+           *-android*) # implemented using dup3(), which fails if oldfd == 
newfd
+             gl_cv_func_dup2_works="guessing no" ;;
            *) gl_cv_func_dup2_works="guessing yes" ;;
          esac])
       ])
diff --git a/gl/m4/eealloc.m4 b/gl/m4/eealloc.m4
index 8a51fe7..322bdd5 100644
--- a/gl/m4/eealloc.m4
+++ b/gl/m4/eealloc.m4
@@ -1,5 +1,5 @@
 # eealloc.m4 serial 3
-dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/environ.m4 b/gl/m4/environ.m4
index cfabe46..4dbf947 100644
--- a/gl/m4/environ.m4
+++ b/gl/m4/environ.m4
@@ -1,5 +1,5 @@
 # environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/errno_h.m4 b/gl/m4/errno_h.m4
index 4ee9e6a..cfaa687 100644
--- a/gl/m4/errno_h.m4
+++ b/gl/m4/errno_h.m4
@@ -1,5 +1,5 @@
 # errno_h.m4 serial 12
-dnl Copyright (C) 2004, 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006, 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/error.m4 b/gl/m4/error.m4
index f08ae50..b3bd7f6 100644
--- a/gl/m4/error.m4
+++ b/gl/m4/error.m4
@@ -1,6 +1,6 @@
 #serial 14
 
-# Copyright (C) 1996-1998, 2001-2004, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2001-2004, 2009-2015 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gl/m4/extensions.m4 b/gl/m4/extensions.m4
index 37f55ca..35bc49c 100644
--- a/gl/m4/extensions.m4
+++ b/gl/m4/extensions.m4
@@ -1,7 +1,7 @@
 # serial 13  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -68,6 +68,10 @@ dnl configure.ac when using autoheader 2.62.
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Use GNU style printf and scanf.  */
+#ifndef __USE_MINGW_ANSI_STDIO
+# undef __USE_MINGW_ANSI_STDIO
+#endif
 /* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
@@ -100,6 +104,7 @@ dnl configure.ac when using autoheader 2.62.
   AC_DEFINE([_ALL_SOURCE])
   AC_DEFINE([_DARWIN_C_SOURCE])
   AC_DEFINE([_GNU_SOURCE])
+  AC_DEFINE([__USE_MINGW_ANSI_STDIO])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
   AC_DEFINE([_TANDEM_SOURCE])
   AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined],
diff --git a/gl/m4/extern-inline.m4 b/gl/m4/extern-inline.m4
index 7f1bb39..e74339a 100644
--- a/gl/m4/extern-inline.m4
+++ b/gl/m4/extern-inline.m4
@@ -1,6 +1,6 @@
 dnl 'extern inline' a la ISO C99.
 
-dnl Copyright 2012-2014 Free Software Foundation, Inc.
+dnl Copyright 2012-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -74,6 +74,11 @@ AC_DEFUN([gl_EXTERN_INLINE],
 # define _GL_EXTERN_INLINE static _GL_UNUSED
 #endif
 
+/* In GCC, suppress bogus "no previous prototype for 'FOO'"
+   and "no previous declaration for 'FOO'" diagnostics,
+   when FOO is an inline function in the header; see
+   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113> and
+   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63877>.  */
 #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
 # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
 #  define _GL_INLINE_HEADER_CONST_PRAGMA
@@ -81,10 +86,6 @@ AC_DEFUN([gl_EXTERN_INLINE],
 #  define _GL_INLINE_HEADER_CONST_PRAGMA \
      _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
 # endif
-  /* Suppress GCC's bogus "no previous prototype for 'FOO'"
-     and "no previous declaration for 'FOO'"  diagnostics,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.  */
 # define _GL_INLINE_HEADER_BEGIN \
     _Pragma ("GCC diagnostic push") \
     _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
diff --git a/gl/m4/fcntl-o.m4 b/gl/m4/fcntl-o.m4
index 43c9312..891a62f 100644
--- a/gl/m4/fcntl-o.m4
+++ b/gl/m4/fcntl-o.m4
@@ -1,5 +1,5 @@
 # fcntl-o.m4 serial 4
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/fcntl_h.m4 b/gl/m4/fcntl_h.m4
index fb2556d..b279162 100644
--- a/gl/m4/fcntl_h.m4
+++ b/gl/m4/fcntl_h.m4
@@ -1,6 +1,6 @@
 # serial 15
 # Configure fcntl.h.
-dnl Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/fdopen.m4 b/gl/m4/fdopen.m4
index 4cf8f35..8c57b99 100644
--- a/gl/m4/fdopen.m4
+++ b/gl/m4/fdopen.m4
@@ -1,5 +1,5 @@
 # fdopen.m4 serial 3
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/fstat.m4 b/gl/m4/fstat.m4
index ddd3fb9..d6a9288 100644
--- a/gl/m4/fstat.m4
+++ b/gl/m4/fstat.m4
@@ -1,5 +1,5 @@
 # fstat.m4 serial 4
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/getcwd.m4 b/gl/m4/getcwd.m4
index fc986cd..b9fbcec 100644
--- a/gl/m4/getcwd.m4
+++ b/gl/m4/getcwd.m4
@@ -1,6 +1,6 @@
 # getcwd.m4 - check for working getcwd that is compatible with glibc
 
-# Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -136,11 +136,16 @@ AC_DEFUN([gl_FUNC_GETCWD],
         [Define to 1 if getcwd works, except it sometimes fails when it
          shouldn't, setting errno to ERANGE, ENAMETOOLONG, or ENOENT.])
       ;;
+    "yes, but with shorter paths")
+      AC_DEFINE([HAVE_GETCWD_SHORTER], [1],
+        [Define to 1 if getcwd works, but with shorter paths
+         than is generally tested with the replacement.])
+      ;;
   esac
 
   if { case "$gl_cv_func_getcwd_null" in *yes) false;; *) true;; esac; } \
      || test $gl_cv_func_getcwd_posix_signature != yes \
-     || test "$gl_cv_func_getcwd_path_max" != yes \
+     || { case "$gl_cv_func_getcwd_path_max" in *yes*) false;; *) true;; esac; 
} \
      || test $gl_abort_bug = yes; then
     REPLACE_GETCWD=1
   fi
diff --git a/gl/m4/getdtablesize.m4 b/gl/m4/getdtablesize.m4
index aa523b6..25e9968 100644
--- a/gl/m4/getdtablesize.m4
+++ b/gl/m4/getdtablesize.m4
@@ -1,5 +1,5 @@
-# getdtablesize.m4 serial 5
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# getdtablesize.m4 serial 6
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,7 +9,9 @@ AC_DEFUN([gl_FUNC_GETDTABLESIZE],
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CHECK_FUNCS_ONCE([getdtablesize])
-  if test $ac_cv_func_getdtablesize = yes; then
+  AC_CHECK_DECLS_ONCE([getdtablesize])
+  if test $ac_cv_func_getdtablesize = yes &&
+     test $ac_cv_have_decl_getdtablesize = yes; then
     # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit
     # up to an unchangeable hard limit; all other platforms correctly
     # require setrlimit before getdtablesize() can report a larger value.
diff --git a/gl/m4/getopt.m4 b/gl/m4/getopt.m4
index f127028..e76e501 100644
--- a/gl/m4/getopt.m4
+++ b/gl/m4/getopt.m4
@@ -1,5 +1,5 @@
 # getopt.m4 serial 44
-dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/gettimeofday.m4 b/gl/m4/gettimeofday.m4
index 1c2d66e..ce246e1 100644
--- a/gl/m4/gettimeofday.m4
+++ b/gl/m4/gettimeofday.m4
@@ -1,6 +1,6 @@
 # serial 21
 
-# Copyright (C) 2001-2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 519670c..61e1f01 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 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
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index 35f6195..b301abe 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 35
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 36
+dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -319,26 +319,28 @@ m4_ifdef([AC_PROG_MKDIR_P], [
 ])
 
 # AC_C_RESTRICT
-# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
-# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
-# works.
-# This definition can be removed once autoconf >= 2.62 can be assumed.
-# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness.
-m4_ifndef([AC_AUTOCONF_VERSION],[
+# This definition is copied from post-2.69 Autoconf and overrides the
+# AC_C_RESTRICT macro from autoconf 2.60..2.69.  It can be removed
+# once autoconf >= 2.70 can be assumed.  It's painful to check version
+# numbers, and in practice this macro is more up-to-date than Autoconf
+# is, so override Autoconf unconditionally.
 AC_DEFUN([AC_C_RESTRICT],
 [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
   [ac_cv_c_restrict=no
    # The order here caters to the fact that C++ does not require restrict.
    for ac_kw in __restrict __restrict__ _Restrict restrict; do
-     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-      [[typedef int * int_ptr;
-        int foo (int_ptr $ac_kw ip) {
-        return ip[0];
-       }]],
-      [[int s[1];
-        int * $ac_kw t = s;
-        t[0] = 0;
-        return foo(t)]])],
+     AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM(
+        [[typedef int *int_ptr;
+          int foo (int_ptr $ac_kw ip) { return ip[0]; }
+          int bar (int [$ac_kw]); /* Catch GCC bug 14050.  */
+          int bar (int ip[$ac_kw]) { return ip[0]; }
+        ]],
+        [[int s[1];
+          int *$ac_kw t = s;
+          t[0] = 0;
+          return foo (t) + bar (t);
+        ]])],
       [ac_cv_c_restrict=$ac_kw])
      test "$ac_cv_c_restrict" != no && break
    done
@@ -348,21 +350,21 @@ AC_DEFUN([AC_C_RESTRICT],
    nothing if this is not supported.  Do not define if restrict is
    supported directly.  */
 #undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict, even
-   though the corresponding Sun C compiler does, which causes
-   "#define restrict _Restrict" in the previous line.  Perhaps some future
-   version of Sun C++ will work with _Restrict; if so, it'll probably
-   define __RESTRICT, just as Sun C does.  */
+/* Work around a bug in Sun C++: it does not support _Restrict or
+   __restrict__, even though the corresponding Sun C compiler ends up with
+   "#define restrict _Restrict" or "#define restrict __restrict__" in the
+   previous line.  Perhaps some future version of Sun C++ will work with
+   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
 #if defined __SUNPRO_CC && !defined __RESTRICT
 # define _Restrict
+# define __restrict__
 #endif])
  case $ac_cv_c_restrict in
    restrict) ;;
    no) AC_DEFINE([restrict], []) ;;
    *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
  esac
-])
-])
+])# AC_C_RESTRICT
 
 # gl_BIGENDIAN
 # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 02499a4..076d36d 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 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
@@ -122,6 +122,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module ssize_t:
   # Code from module stat:
   # Code from module stat-tests:
+  # Code from module stdalign:
+  # Code from module stdalign-tests:
   # Code from module stdarg:
   dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode
   dnl for the builtin va_copy to work.  With Autoconf 2.60 or later,
@@ -393,6 +395,7 @@ changequote([, ])dnl
     gl_PREREQ_STAT
   fi
   gl_SYS_STAT_MODULE_INDICATOR([stat])
+  gl_STDALIGN_H
   AM_STDBOOL_H
   gl_STDINT_H
   AC_REQUIRE([gt_TYPE_WCHAR_T])
@@ -525,6 +528,7 @@ AC_DEFUN([gl_FILE_LIST], [
   build-aux/vc-list-files
   doc/fdl-1.3.texi
   doc/gendocs_template
+  doc/gendocs_template_min
   lib/errno.in.h
   lib/error.c
   lib/error.h
@@ -598,6 +602,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/setenv.m4
   m4/ssize_t.m4
   m4/stat.m4
+  m4/stdalign.m4
   m4/stdarg.m4
   m4/stdbool.m4
   m4/stddef_h.m4
@@ -655,6 +660,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-setenv.c
   tests/test-stat.c
   tests/test-stat.h
+  tests/test-stdalign.c
   tests/test-stdbool.c
   tests/test-stddef.c
   tests/test-stdint.c
@@ -698,6 +704,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests=lib/same-inode.h
   tests=lib/setenv.c
   tests=lib/stat.c
+  tests=lib/stdalign.in.h
   tests=lib/stdbool.in.h
   tests=lib/stdint.in.h
   tests=lib/stdlib.in.h
diff --git a/gl/m4/gnulib-tool.m4 b/gl/m4/gnulib-tool.m4
index a588e15..fede1fc 100644
--- a/gl/m4/gnulib-tool.m4
+++ b/gl/m4/gnulib-tool.m4
@@ -1,5 +1,5 @@
 # gnulib-tool.m4 serial 2
-dnl Copyright (C) 2004-2005, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/include_next.m4 b/gl/m4/include_next.m4
index 69ad3db..233d254 100644
--- a/gl/m4/include_next.m4
+++ b/gl/m4/include_next.m4
@@ -1,5 +1,5 @@
 # include_next.m4 serial 23
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/inttypes-pri.m4 b/gl/m4/inttypes-pri.m4
index 00251e1..0884e71 100644
--- a/gl/m4/inttypes-pri.m4
+++ b/gl/m4/inttypes-pri.m4
@@ -1,5 +1,5 @@
 # inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2002, 2006, 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/inttypes.m4 b/gl/m4/inttypes.m4
index 2f9317d..4209ffd 100644
--- a/gl/m4/inttypes.m4
+++ b/gl/m4/inttypes.m4
@@ -1,5 +1,5 @@
 # inttypes.m4 serial 26
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/largefile.m4 b/gl/m4/largefile.m4
index a1b564a..b7a6c48 100644
--- a/gl/m4/largefile.m4
+++ b/gl/m4/largefile.m4
@@ -1,6 +1,6 @@
 # Enable large files on systems where this is not the default.
 
-# Copyright 1992-1996, 1998-2014 Free Software Foundation, Inc.
+# Copyright 1992-1996, 1998-2015 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/longlong.m4 b/gl/m4/longlong.m4
index eefb37c..d57bc70 100644
--- a/gl/m4/longlong.m4
+++ b/gl/m4/longlong.m4
@@ -1,5 +1,5 @@
 # longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/lstat.m4 b/gl/m4/lstat.m4
index c5e72b8..f6c7dd1 100644
--- a/gl/m4/lstat.m4
+++ b/gl/m4/lstat.m4
@@ -1,6 +1,6 @@
 # serial 26
 
-# Copyright (C) 1997-2001, 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003-2015 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gl/m4/malloc.m4 b/gl/m4/malloc.m4
index 322ad6e..31368ab 100644
--- a/gl/m4/malloc.m4
+++ b/gl/m4/malloc.m4
@@ -1,5 +1,5 @@
 # malloc.m4 serial 14
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/malloca.m4 b/gl/m4/malloca.m4
index dcc1a08..7248951 100644
--- a/gl/m4/malloca.m4
+++ b/gl/m4/malloca.m4
@@ -1,5 +1,5 @@
 # malloca.m4 serial 1
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2014 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2015 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gl/m4/manywarnings.m4 b/gl/m4/manywarnings.m4
index e1cee6c..44da98e 100644
--- a/gl/m4/manywarnings.m4
+++ b/gl/m4/manywarnings.m4
@@ -1,5 +1,5 @@
-# manywarnings.m4 serial 6
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# manywarnings.m4 serial 7
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -93,6 +93,14 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
   fi
 
   # List all gcc warning categories.
+  # To compare this list to your installed GCC's, run this Bash command:
+  #
+  # comm -3 \
+  #  <(sed -n 's/^  *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \
+  #  <(gcc --help=warnings | sed -n 's/^  \(-[^ ]*\) .*/\1/p' | sort |
+  #      grep -v -x -f <(
+  #         awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec))
+
   gl_manywarn_set=
   for gl_manywarn_item in \
     -W \
@@ -111,6 +119,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
     -Wcomments \
     -Wcoverage-mismatch \
     -Wcpp \
+    -Wdate-time \
     -Wdeprecated \
     -Wdeprecated-declarations \
     -Wdisabled-optimization \
@@ -150,9 +159,9 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
     -Wnarrowing \
     -Wnested-externs \
     -Wnonnull \
-    -Wnormalized=nfc \
     -Wold-style-declaration \
     -Wold-style-definition \
+    -Wopenmp-simd \
     -Woverflow \
     -Woverlength-strings \
     -Woverride-init \
@@ -203,13 +212,26 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
     -Wvla \
     -Wvolatile-register-var \
     -Wwrite-strings \
-    -fdiagnostics-show-option \
-    -funit-at-a-time \
     \
     ; do
     gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
   done
 
+  # gcc --help=warnings outputs an unusual form for this option; list
+  # it here so that the above 'comm' command doesn't report a false match.
+  gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc"
+
+  # These are needed for older GCC versions.
+  if test -n "$GCC"; then
+    case `($CC --version) 2>/dev/null` in
+      'gcc (GCC) '[[0-3]].* | \
+      'gcc (GCC) '4.[[0-7]].*)
+        gl_manywarn_set="$gl_manywarn_set -fdiagnostics-show-option"
+        gl_manywarn_set="$gl_manywarn_set -funit-at-a-time"
+          ;;
+    esac
+  fi
+
   # Disable specific options as needed.
   if test "$gl_cv_cc_nomfi_needed" = yes; then
     gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers"
diff --git a/gl/m4/mode_t.m4 b/gl/m4/mode_t.m4
index db6e192..01badba 100644
--- a/gl/m4/mode_t.m4
+++ b/gl/m4/mode_t.m4
@@ -1,5 +1,5 @@
 # mode_t.m4 serial 2
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/msvc-inval.m4 b/gl/m4/msvc-inval.m4
index 7f26087..9446fa5 100644
--- a/gl/m4/msvc-inval.m4
+++ b/gl/m4/msvc-inval.m4
@@ -1,5 +1,5 @@
 # msvc-inval.m4 serial 1
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/msvc-nothrow.m4 b/gl/m4/msvc-nothrow.m4
index 9e32c17..5d72a04 100644
--- a/gl/m4/msvc-nothrow.m4
+++ b/gl/m4/msvc-nothrow.m4
@@ -1,5 +1,5 @@
 # msvc-nothrow.m4 serial 1
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/multiarch.m4 b/gl/m4/multiarch.m4
index 2cb956d..fc575c1 100644
--- a/gl/m4/multiarch.m4
+++ b/gl/m4/multiarch.m4
@@ -1,5 +1,5 @@
 # multiarch.m4 serial 7
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/nocrash.m4 b/gl/m4/nocrash.m4
index 5a5d77d..5628318 100644
--- a/gl/m4/nocrash.m4
+++ b/gl/m4/nocrash.m4
@@ -1,5 +1,5 @@
 # nocrash.m4 serial 4
-dnl Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/off_t.m4 b/gl/m4/off_t.m4
index f5885b3..0eb1467 100644
--- a/gl/m4/off_t.m4
+++ b/gl/m4/off_t.m4
@@ -1,5 +1,5 @@
 # off_t.m4 serial 1
-dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/open.m4 b/gl/m4/open.m4
index 68f116f..2accbaa 100644
--- a/gl/m4/open.m4
+++ b/gl/m4/open.m4
@@ -1,5 +1,5 @@
 # open.m4 serial 14
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/pathmax.m4 b/gl/m4/pathmax.m4
index 114f91f..0e3db7a 100644
--- a/gl/m4/pathmax.m4
+++ b/gl/m4/pathmax.m4
@@ -1,5 +1,5 @@
 # pathmax.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gl/m4/putenv.m4 b/gl/m4/putenv.m4
index d79321b..73a5f46 100644
--- a/gl/m4/putenv.m4
+++ b/gl/m4/putenv.m4
@@ -1,5 +1,5 @@
 # putenv.m4 serial 20
-dnl Copyright (C) 2002-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/setenv.m4 b/gl/m4/setenv.m4
index 0f46a7b..3aa38d8 100644
--- a/gl/m4/setenv.m4
+++ b/gl/m4/setenv.m4
@@ -1,5 +1,5 @@
 # setenv.m4 serial 26
-dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/ssize_t.m4 b/gl/m4/ssize_t.m4
index fbe1d06..25bd451 100644
--- a/gl/m4/ssize_t.m4
+++ b/gl/m4/ssize_t.m4
@@ -1,5 +1,5 @@
 # ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/stat.m4 b/gl/m4/stat.m4
index 1ae327b..d1b3768 100644
--- a/gl/m4/stat.m4
+++ b/gl/m4/stat.m4
@@ -1,6 +1,6 @@
 # serial 11
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2015 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gl/m4/stdalign.m4 b/gl/m4/stdalign.m4
new file mode 100644
index 0000000..033b0d3
--- /dev/null
+++ b/gl/m4/stdalign.m4
@@ -0,0 +1,57 @@
+# Check for stdalign.h that conforms to C11.
+
+dnl Copyright 2011-2015 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Prepare for substituting <stdalign.h> if it is not supported.
+
+AC_DEFUN([gl_STDALIGN_H],
+[
+  AC_CACHE_CHECK([for working stdalign.h],
+    [gl_cv_header_working_stdalign_h],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stdalign.h>
+            #include <stddef.h>
+
+            /* Test that alignof yields a result consistent with offsetof.
+               This catches GCC bug 52023
+               <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.  */
+            #ifdef __cplusplus
+               template <class t> struct alignof_helper { char a; t b; };
+            # define ao(type) offsetof (alignof_helper<type>, b)
+            #else
+            # define ao(type) offsetof (struct { char a; type b; }, b)
+            #endif
+            char test_double[ao (double) % _Alignof (double) == 0 ? 1 : -1];
+            char test_long[ao (long int) % _Alignof (long int) == 0 ? 1 : -1];
+            char test_alignof[alignof (double) == _Alignof (double) ? 1 : -1];
+
+            /* Test _Alignas only on platforms where gnulib can help.  */
+            #if \
+                ((defined __cplusplus && 201103 <= __cplusplus) \
+                 || (defined __APPLE__ && defined __MACH__ \
+                     ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
+                     : __GNUC__) \
+                 || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \
+                 || __ICC || 0x5110 <= __SUNPRO_C \
+                 || 1300 <= _MSC_VER)
+              struct alignas_test { char c; char alignas (8) alignas_8; };
+              char test_alignas[offsetof (struct alignas_test, alignas_8) == 8
+                                ? 1 : -1];
+            #endif
+          ]])],
+       [gl_cv_header_working_stdalign_h=yes],
+       [gl_cv_header_working_stdalign_h=no])])
+
+  if test $gl_cv_header_working_stdalign_h = yes; then
+    STDALIGN_H=''
+  else
+    STDALIGN_H='stdalign.h'
+  fi
+
+  AC_SUBST([STDALIGN_H])
+  AM_CONDITIONAL([GL_GENERATE_STDALIGN_H], [test -n "$STDALIGN_H"])
+])
diff --git a/gl/m4/stdarg.m4 b/gl/m4/stdarg.m4
index 732aa31..d208eb3 100644
--- a/gl/m4/stdarg.m4
+++ b/gl/m4/stdarg.m4
@@ -1,5 +1,5 @@
 # stdarg.m4 serial 6
-dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/stdbool.m4 b/gl/m4/stdbool.m4
index 006ed52..7273b82 100644
--- a/gl/m4/stdbool.m4
+++ b/gl/m4/stdbool.m4
@@ -1,6 +1,6 @@
 # Check for stdbool.h that conforms to C99.
 
-dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/stddef_h.m4 b/gl/m4/stddef_h.m4
index c555e29..2310502 100644
--- a/gl/m4/stddef_h.m4
+++ b/gl/m4/stddef_h.m4
@@ -1,6 +1,6 @@
-dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
-# stddef_h.m4 serial 4
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+dnl A placeholder for <stddef.h>, for platforms that have issues.
+# stddef_h.m4 serial 5
+dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,6 +10,9 @@ AC_DEFUN([gl_STDDEF_H],
   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
   AC_REQUIRE([gt_TYPE_WCHAR_T])
   STDDEF_H=
+  AC_CHECK_TYPE([max_align_t], [], [HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h],
+    [[#include <stddef.h>
+    ]])
   if test $gt_cv_c_wchar_t = no; then
     HAVE_WCHAR_T=0
     STDDEF_H=stddef.h
@@ -43,5 +46,6 @@ AC_DEFUN([gl_STDDEF_H_DEFAULTS],
 [
   dnl Assume proper GNU behavior unless another module says otherwise.
   REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
+  HAVE_MAX_ALIGN_T=1;            AC_SUBST([HAVE_MAX_ALIGN_T])
   HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
 ])
diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4
index 1981d9d..4011a49 100644
--- a/gl/m4/stdint.m4
+++ b/gl/m4/stdint.m4
@@ -1,5 +1,5 @@
 # stdint.m4 serial 43
-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/stdio_h.m4 b/gl/m4/stdio_h.m4
index d15913a..e0c4bde 100644
--- a/gl/m4/stdio_h.m4
+++ b/gl/m4/stdio_h.m4
@@ -1,14 +1,35 @@
-# stdio_h.m4 serial 43
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# stdio_h.m4 serial 44
+dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_STDIO_H],
 [
+  dnl For __USE_MINGW_ANSI_STDIO
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   gl_NEXT_HEADERS([stdio.h])
 
+  dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and
+  dnl inttypes.h behave like gnu instead of system; we must give our
+  dnl printf wrapper the right attribute to match.
+  AC_CACHE_CHECK([whether inttypes macros match system or gnu printf],
+    [gl_cv_func_printf_attribute_flavor],
+    [AC_EGREP_CPP([findme .(ll|j)d. findme],
+      [#define __STDC_FORMAT_MACROS 1
+       #include <stdio.h>
+       #include <inttypes.h>
+       findme PRIdMAX findme
+      ], [gl_cv_func_printf_attribute_flavor=gnu],
+      [gl_cv_func_printf_attribute_flavor=system])])
+  if test "$gl_cv_func_printf_attribute_flavor" = gnu; then
+    AC_DEFINE([GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU], [1],
+      [Define to 1 if printf and friends should be labeled with
+       attribute "__gnu_printf__" instead of "__printf__"])
+  fi
+
   dnl No need to create extra modules for these functions. Everyone who uses
   dnl <stdio.h> likely needs them.
   GNULIB_FSCANF=1
diff --git a/gl/m4/stdlib_h.m4 b/gl/m4/stdlib_h.m4
index 03b448b..0b4c623 100644
--- a/gl/m4/stdlib_h.m4
+++ b/gl/m4/stdlib_h.m4
@@ -1,5 +1,5 @@
 # stdlib_h.m4 serial 42
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -55,6 +55,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   GNULIB_PTSNAME=0;       AC_SUBST([GNULIB_PTSNAME])
   GNULIB_PTSNAME_R=0;     AC_SUBST([GNULIB_PTSNAME_R])
   GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
+  GNULIB_QSORT_R=0;       AC_SUBST([GNULIB_QSORT_R])
   GNULIB_RANDOM=0;        AC_SUBST([GNULIB_RANDOM])
   GNULIB_RANDOM_R=0;      AC_SUBST([GNULIB_RANDOM_R])
   GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
@@ -107,6 +108,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   REPLACE_PTSNAME=0;         AC_SUBST([REPLACE_PTSNAME])
   REPLACE_PTSNAME_R=0;       AC_SUBST([REPLACE_PTSNAME_R])
   REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
+  REPLACE_QSORT_R=0;         AC_SUBST([REPLACE_QSORT_R])
   REPLACE_RANDOM_R=0;        AC_SUBST([REPLACE_RANDOM_R])
   REPLACE_REALLOC=0;         AC_SUBST([REPLACE_REALLOC])
   REPLACE_REALPATH=0;        AC_SUBST([REPLACE_REALPATH])
diff --git a/gl/m4/strerror.m4 b/gl/m4/strerror.m4
index 0763fe3..75a17f2 100644
--- a/gl/m4/strerror.m4
+++ b/gl/m4/strerror.m4
@@ -1,5 +1,5 @@
 # strerror.m4 serial 17
-dnl Copyright (C) 2002, 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/string_h.m4 b/gl/m4/string_h.m4
index 64e683f..55d09ef 100644
--- a/gl/m4/string_h.m4
+++ b/gl/m4/string_h.m4
@@ -1,6 +1,6 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# Copyright (C) 2007-2015 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/symlink.m4 b/gl/m4/symlink.m4
index de4924b..a59e2f0 100644
--- a/gl/m4/symlink.m4
+++ b/gl/m4/symlink.m4
@@ -1,7 +1,7 @@
 # serial 6
 # See if we need to provide symlink replacement.
 
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/sys_socket_h.m4 b/gl/m4/sys_socket_h.m4
index 114d828..eaeabe7 100644
--- a/gl/m4/sys_socket_h.m4
+++ b/gl/m4/sys_socket_h.m4
@@ -1,5 +1,5 @@
 # sys_socket_h.m4 serial 23
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/sys_stat_h.m4 b/gl/m4/sys_stat_h.m4
index eaa7642..6c909e8 100644
--- a/gl/m4/sys_stat_h.m4
+++ b/gl/m4/sys_stat_h.m4
@@ -1,5 +1,5 @@
 # sys_stat_h.m4 serial 28   -*- Autoconf -*-
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/sys_time_h.m4 b/gl/m4/sys_time_h.m4
index 5c79300..50133b9 100644
--- a/gl/m4/sys_time_h.m4
+++ b/gl/m4/sys_time_h.m4
@@ -1,7 +1,7 @@
 # Configure a replacement for <sys/time.h>.
 # serial 8
 
-# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/sys_types_h.m4 b/gl/m4/sys_types_h.m4
index 9748905..2232aec 100644
--- a/gl/m4/sys_types_h.m4
+++ b/gl/m4/sys_types_h.m4
@@ -1,5 +1,5 @@
 # sys_types_h.m4 serial 5
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/time_h.m4 b/gl/m4/time_h.m4
index 9852778..d9c41a4 100644
--- a/gl/m4/time_h.m4
+++ b/gl/m4/time_h.m4
@@ -1,8 +1,8 @@
 # Configure a more-standard replacement for <time.h>.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
 
-# serial 8
+# serial 9
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -26,7 +26,7 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY],
 ])
 
 dnl Check whether 'struct timespec' is declared
-dnl in time.h, sys/time.h, or pthread.h.
+dnl in time.h, sys/time.h, pthread.h, or unistd.h.
 
 AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
 [
@@ -44,6 +44,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
   TIME_H_DEFINES_STRUCT_TIMESPEC=0
   SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0
   PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0
+  UNISTD_H_DEFINES_STRUCT_TIMESPEC=0
   if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
     TIME_H_DEFINES_STRUCT_TIMESPEC=1
   else
@@ -70,12 +71,26 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
            [gl_cv_sys_struct_timespec_in_pthread_h=no])])
       if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then
         PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1
+      else
+        AC_CACHE_CHECK([for struct timespec in <unistd.h>],
+          [gl_cv_sys_struct_timespec_in_unistd_h],
+          [AC_COMPILE_IFELSE(
+             [AC_LANG_PROGRAM(
+                [[#include <unistd.h>
+                ]],
+                [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
+             [gl_cv_sys_struct_timespec_in_unistd_h=yes],
+             [gl_cv_sys_struct_timespec_in_unistd_h=no])])
+        if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then
+          UNISTD_H_DEFINES_STRUCT_TIMESPEC=1
+        fi
       fi
     fi
   fi
   AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC])
   AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC])
   AC_SUBST([PTHREAD_H_DEFINES_STRUCT_TIMESPEC])
+  AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC])
 ])
 
 AC_DEFUN([gl_TIME_MODULE_INDICATOR],
diff --git a/gl/m4/unistd_h.m4 b/gl/m4/unistd_h.m4
index 1fa197e..b3c581f 100644
--- a/gl/m4/unistd_h.m4
+++ b/gl/m4/unistd_h.m4
@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 67
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# unistd_h.m4 serial 68
+dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -173,9 +173,11 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   REPLACE_PWRITE=0;       AC_SUBST([REPLACE_PWRITE])
   REPLACE_READ=0;         AC_SUBST([REPLACE_READ])
   REPLACE_READLINK=0;     AC_SUBST([REPLACE_READLINK])
+  REPLACE_READLINKAT=0;   AC_SUBST([REPLACE_READLINKAT])
   REPLACE_RMDIR=0;        AC_SUBST([REPLACE_RMDIR])
   REPLACE_SLEEP=0;        AC_SUBST([REPLACE_SLEEP])
   REPLACE_SYMLINK=0;      AC_SUBST([REPLACE_SYMLINK])
+  REPLACE_SYMLINKAT=0;    AC_SUBST([REPLACE_SYMLINKAT])
   REPLACE_TTYNAME_R=0;    AC_SUBST([REPLACE_TTYNAME_R])
   REPLACE_UNLINK=0;       AC_SUBST([REPLACE_UNLINK])
   REPLACE_UNLINKAT=0;     AC_SUBST([REPLACE_UNLINKAT])
diff --git a/gl/m4/valgrind-tests.m4 b/gl/m4/valgrind-tests.m4
index fb91d53..7a5de2f 100644
--- a/gl/m4/valgrind-tests.m4
+++ b/gl/m4/valgrind-tests.m4
@@ -1,5 +1,5 @@
 # valgrind-tests.m4 serial 3
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/version-etc.m4 b/gl/m4/version-etc.m4
index 667f9f8..a87ac98 100644
--- a/gl/m4/version-etc.m4
+++ b/gl/m4/version-etc.m4
@@ -1,5 +1,5 @@
 # version-etc.m4 serial 1
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2015 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/warn-on-use.m4 b/gl/m4/warn-on-use.m4
index cc690f8..1e98dc9 100644
--- a/gl/m4/warn-on-use.m4
+++ b/gl/m4/warn-on-use.m4
@@ -1,5 +1,5 @@
 # warn-on-use.m4 serial 5
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/warnings.m4 b/gl/m4/warnings.m4
index 43156f4..5ae01de 100644
--- a/gl/m4/warnings.m4
+++ b/gl/m4/warnings.m4
@@ -1,5 +1,5 @@
 # warnings.m4 serial 11
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/wchar_h.m4 b/gl/m4/wchar_h.m4
index 85db952..9d1b0f8 100644
--- a/gl/m4/wchar_h.m4
+++ b/gl/m4/wchar_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/wchar_t.m4 b/gl/m4/wchar_t.m4
index 839a04c..dc964e6 100644
--- a/gl/m4/wchar_t.m4
+++ b/gl/m4/wchar_t.m4
@@ -1,5 +1,5 @@
 # wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/m4/wint_t.m4 b/gl/m4/wint_t.m4
index 9b07b07..ca3fd44 100644
--- a/gl/m4/wint_t.m4
+++ b/gl/m4/wint_t.m4
@@ -1,5 +1,5 @@
 # wint_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/msvc-inval.c b/gl/msvc-inval.c
index f83827f..a1f1dc0 100644
--- a/gl/msvc-inval.c
+++ b/gl/msvc-inval.c
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gl/msvc-inval.h b/gl/msvc-inval.h
index a0ef540..8b07269 100644
--- a/gl/msvc-inval.h
+++ b/gl/msvc-inval.h
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gl/msvc-nothrow.c b/gl/msvc-nothrow.c
index b1e5f0c..90cf801 100644
--- a/gl/msvc-nothrow.c
+++ b/gl/msvc-nothrow.c
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gl/msvc-nothrow.h b/gl/msvc-nothrow.h
index 0d4dea5..67b151e 100644
--- a/gl/msvc-nothrow.h
+++ b/gl/msvc-nothrow.h
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gl/progname.c b/gl/progname.c
index 2919be9..fe93bca 100644
--- a/gl/progname.c
+++ b/gl/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gl/progname.h b/gl/progname.h
index c779214..d396475 100644
--- a/gl/progname.h
+++ b/gl/progname.h
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gl/stdarg.in.h b/gl/stdarg.in.h
index 5b37dd3..5239f51 100644
--- a/gl/stdarg.in.h
+++ b/gl/stdarg.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <stdarg.h>.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/gl/stddef.in.h b/gl/stddef.in.h
index f5c0e05..44db241 100644
--- a/gl/stddef.in.h
+++ b/gl/stddef.in.h
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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
@@ -39,7 +39,6 @@
 
 # if !(defined address@hidden@_STDDEF_H && defined _GL_STDDEF_WINT_T)
 #  ifdef __need_wint_t
-#   undef address@hidden@_STDDEF_H
 #   define _GL_STDDEF_WINT_T
 #  endif
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
@@ -54,33 +53,45 @@
 
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
 
-#  ifndef address@hidden@_STDDEF_H
-#   define address@hidden@_STDDEF_H
-
 /* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
-#if @REPLACE_NULL@
-# undef NULL
-# ifdef __cplusplus
+#  if (@REPLACE_NULL@ \
+       && (!defined address@hidden@_STDDEF_H || defined _GL_STDDEF_WINT_T))
+#   undef NULL
+#   ifdef __cplusplus
    /* ISO C++ says that the macro NULL must expand to an integer constant
       expression, hence '((void *) 0)' is not allowed in C++.  */
-#  if __GNUG__ >= 3
+#    if __GNUG__ >= 3
     /* GNU C++ has a __null macro that behaves like an integer ('int' or
        'long') but has the same size as a pointer.  Use that, to avoid
        warnings.  */
-#   define NULL __null
-#  else
-#   define NULL 0L
+#     define NULL __null
+#    else
+#     define NULL 0L
+#    endif
+#   else
+#    define NULL ((void *) 0)
+#   endif
 #  endif
-# else
-#  define NULL ((void *) 0)
-# endif
-#endif
+
+#  ifndef address@hidden@_STDDEF_H
+#   define address@hidden@_STDDEF_H
 
 /* Some platforms lack wchar_t.  */
 #if address@hidden@
 # define wchar_t int
 #endif
 
+/* Some platforms lack max_align_t.  */
+#if address@hidden@
+typedef union
+{
+  char *__p;
+  double __d;
+  long double __ld;
+  long int __i;
+} max_align_t;
+#endif
+
 #  endif /* address@hidden@_STDDEF_H */
 # endif /* address@hidden@_STDDEF_H */
 #endif /* __need_XXX */
diff --git a/gl/stdio.in.h b/gl/stdio.in.h
index 1e1fe84..759c94d 100644
--- a/gl/stdio.in.h
+++ b/gl/stdio.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2015 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
@@ -84,8 +84,13 @@
    except that it indicates to GCC that the supported format string directives
    are the ones of the system printf(), rather than the ones standardized by
    ISO C99 and POSIX.  */
-#define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, 
first_argument) \
+#if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU
+# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, 
first_argument) \
+  _GL_ATTRIBUTE_FORMAT_PRINTF (formatstring_parameter, first_argument)
+#else
+# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, 
first_argument) \
   _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
+#endif
 
 /* _GL_ATTRIBUTE_FORMAT_SCANF
    indicates to GCC that the function takes a format string and arguments,
diff --git a/gl/strerror-override.c b/gl/strerror-override.c
index 255d933..2bb4d74 100644
--- a/gl/strerror-override.c
+++ b/gl/strerror-override.c
@@ -1,6 +1,6 @@
 /* strerror-override.c --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010-2015 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/gl/strerror-override.h b/gl/strerror-override.h
index e98c1c1..7af36df 100644
--- a/gl/strerror-override.h
+++ b/gl/strerror-override.h
@@ -1,6 +1,6 @@
 /* strerror-override.h --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010-2015 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/gl/strerror.c b/gl/strerror.c
index e54f0cc..adba738 100644
--- a/gl/strerror.c
+++ b/gl/strerror.c
@@ -1,6 +1,6 @@
 /* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/gl/string.in.h b/gl/string.in.h
index 9062142..ebd727e 100644
--- a/gl/string.in.h
+++ b/gl/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2015 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/gl/sys_types.in.h b/gl/sys_types.in.h
index deb5d67..814bc17 100644
--- a/gl/sys_types.in.h
+++ b/gl/sys_types.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/types.h.
 
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gl/unistd.in.h b/gl/unistd.in.h
index 622b228..958fea2 100644
--- a/gl/unistd.in.h
+++ b/gl/unistd.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2015 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
@@ -401,6 +401,12 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - "
 /* Set of environment variables and values.  An array of strings of the form
    "VARIABLE=VALUE", terminated with a NULL.  */
 #  if defined __APPLE__ && defined __MACH__
+#   include <TargetConditionals.h>
+#   if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
+#    define _GL_USE_CRT_EXTERNS
+#   endif
+#  endif
+#  ifdef _GL_USE_CRT_EXTERNS
 #   include <crt_externs.h>
 #   define environ (*_NSGetEnviron ())
 #  else
@@ -1287,13 +1293,24 @@ _GL_WARN_ON_USE (readlink, "readlink is unportable - "
 
 
 #if @GNULIB_READLINKAT@
-# if address@hidden@
+# if @REPLACE_READLINKAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define readlinkat rpl_readlinkat
+#  endif
+_GL_FUNCDECL_RPL (readlinkat, ssize_t,
+                  (int fd, char const *file, char *buf, size_t len)
+                  _GL_ARG_NONNULL ((2, 3)));
+_GL_CXXALIAS_RPL (readlinkat, ssize_t,
+                  (int fd, char const *file, char *buf, size_t len));
+# else
+#  if address@hidden@
 _GL_FUNCDECL_SYS (readlinkat, ssize_t,
                   (int fd, char const *file, char *buf, size_t len)
                   _GL_ARG_NONNULL ((2, 3)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (readlinkat, ssize_t,
                   (int fd, char const *file, char *buf, size_t len));
+# endif
 _GL_CXXALIASWARN (readlinkat);
 #elif defined GNULIB_POSIXCHECK
 # undef readlinkat
@@ -1407,13 +1424,25 @@ _GL_WARN_ON_USE (symlink, "symlink is not portable - "
 
 
 #if @GNULIB_SYMLINKAT@
-# if address@hidden@
+# if @REPLACE_SYMLINKAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef symlinkat
+#   define symlinkat rpl_symlinkat
+#  endif
+_GL_FUNCDECL_RPL (symlinkat, int,
+                  (char const *contents, int fd, char const *file)
+                  _GL_ARG_NONNULL ((1, 3)));
+_GL_CXXALIAS_RPL (symlinkat, int,
+                  (char const *contents, int fd, char const *file));
+# else
+#  if address@hidden@
 _GL_FUNCDECL_SYS (symlinkat, int,
                   (char const *contents, int fd, char const *file)
                   _GL_ARG_NONNULL ((1, 3)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (symlinkat, int,
                   (char const *contents, int fd, char const *file));
+# endif
 _GL_CXXALIASWARN (symlinkat);
 #elif defined GNULIB_POSIXCHECK
 # undef symlinkat
diff --git a/gl/verify.h b/gl/verify.h
index a25e514..60eba49 100644
--- a/gl/verify.h
+++ b/gl/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2015 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/gl/version-etc.c b/gl/version-etc.c
index 04f5b62..a93b008 100644
--- a/gl/version-etc.c
+++ b/gl/version-etc.c
@@ -1,5 +1,5 @@
 /* Print --version and bug-reporting information in a consistent format.
-   Copyright (C) 1999-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2015 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
@@ -38,7 +38,7 @@
 # define PACKAGE PACKAGE_TARNAME
 #endif
 
-enum { COPYRIGHT_YEAR = 2014 };
+enum { COPYRIGHT_YEAR = 2015 };
 
 /* The three functions below display the --version information the
    standard way.
diff --git a/gl/version-etc.h b/gl/version-etc.h
index 8e1b2cc..408581e 100644
--- a/gl/version-etc.h
+++ b/gl/version-etc.h
@@ -1,5 +1,5 @@
 /* Print --version and bug-reporting information in a consistent format.
-   Copyright (C) 1999, 2003, 2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003, 2005, 2009-2015 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/gltests/Makefile.am b/gltests/Makefile.am
index 171a71b..f55c886 100644
--- a/gltests/Makefile.am
+++ b/gltests/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 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
@@ -618,6 +618,37 @@ EXTRA_DIST += test-stat.h test-stat.c signature.h macros.h
 
 ## end   gnulib module stat-tests
 
+## begin gnulib module stdalign
+
+BUILT_SOURCES += $(STDALIGN_H)
+
+# We need the following in order to create <stdalign.h> when the system
+# doesn't have one that works.
+if GL_GENERATE_STDALIGN_H
+stdalign.h: stdalign.in.h $(top_builddir)/config.status
+       $(AM_V_GEN)rm -f address@hidden $@ && \
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+         cat $(srcdir)/stdalign.in.h; \
+       } > address@hidden && \
+       mv address@hidden $@
+else
+stdalign.h: $(top_builddir)/config.status
+       rm -f $@
+endif
+MOSTLYCLEANFILES += stdalign.h stdalign.h-t
+
+EXTRA_DIST += stdalign.in.h
+
+## end   gnulib module stdalign
+
+## begin gnulib module stdalign-tests
+
+TESTS += test-stdalign
+check_PROGRAMS += test-stdalign
+EXTRA_DIST += test-stdalign.c macros.h
+
+## end   gnulib module stdalign-tests
+
 ## begin gnulib module stdbool
 
 BUILT_SOURCES += $(STDBOOL_H)
@@ -756,6 +787,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status 
$(CXXDEFS_H) \
              -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
              -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
              -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
+             -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
              -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
              -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
              -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
@@ -807,6 +839,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status 
$(CXXDEFS_H) \
              -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
              -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
              -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+             -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
              -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
              -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
              -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
@@ -1004,6 +1037,7 @@ time.h: time.in.h $(top_builddir)/config.status 
$(CXXDEFS_H) $(ARG_NONNULL_H) $(
              -e 
's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g'
 \
              -e 
's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g'
 \
              -e 
's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
+             -e 
's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|g'
 \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
diff --git a/gltests/alloca.in.h b/gltests/alloca.in.h
index 5de9aaa..906fe92 100644
--- a/gltests/alloca.in.h
+++ b/gltests/alloca.in.h
@@ -1,6 +1,6 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2014 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2015 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify it
diff --git a/gltests/binary-io.h b/gltests/binary-io.h
index 7928f8c..f5b66c7 100644
--- a/gltests/binary-io.h
+++ b/gltests/binary-io.h
@@ -1,5 +1,5 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003, 2005, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2008-2015 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/gltests/close.c b/gltests/close.c
index d7dcb3f..54d1f71 100644
--- a/gltests/close.c
+++ b/gltests/close.c
@@ -1,5 +1,5 @@
 /* close replacement.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/gltests/dosname.h b/gltests/dosname.h
index b92adfa..893baf6 100644
--- a/gltests/dosname.h
+++ b/gltests/dosname.h
@@ -1,6 +1,6 @@
 /* File names on MS-DOS/Windows systems.
 
-   Copyright (C) 2000-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2004-2006, 2009-2015 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/gltests/dup2.c b/gltests/dup2.c
index 7de6805..0e13214 100644
--- a/gltests/dup2.c
+++ b/gltests/dup2.c
@@ -1,6 +1,6 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
 
-   Copyright (C) 1999, 2004-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004-2007, 2009-2015 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/gltests/fcntl.in.h b/gltests/fcntl.in.h
index e23b4b2..e288018 100644
--- a/gltests/fcntl.in.h
+++ b/gltests/fcntl.in.h
@@ -1,6 +1,6 @@
 /* Like <fcntl.h>, but with non-working flags defined to 0.
 
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2015 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
@@ -34,7 +34,7 @@
    extern "C" { ... } block, which leads to errors in C++ mode with the
    overridden <sys/stat.h> from gnulib.  These errors are known to be gone
    with g++ version >= 4.3.  */
-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && 
defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ 
>= 3)))
+#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && 
defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 
&& __GNUC_MINOR__ >= 3))))
 # include <sys/stat.h>
 #endif
 address@hidden@ @NEXT_FCNTL_H@
@@ -53,7 +53,7 @@
    extern "C" { ... } block, which leads to errors in C++ mode with the
    overridden <sys/stat.h> from gnulib.  These errors are known to be gone
    with g++ version >= 4.3.  */
-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && 
defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ 
>= 3)))
+#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && 
defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 
&& __GNUC_MINOR__ >= 3))))
 # include <sys/stat.h>
 #endif
 /* The include_next requires a split double-inclusion guard.  */
diff --git a/gltests/fd-hook.c b/gltests/fd-hook.c
index 0171cc6..b1488c4 100644
--- a/gltests/fd-hook.c
+++ b/gltests/fd-hook.c
@@ -1,5 +1,5 @@
 /* Hook for making making file descriptor functions close(), ioctl() 
extensible.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2009.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gltests/fd-hook.h b/gltests/fd-hook.h
index 1aa264e..bdb9aef 100644
--- a/gltests/fd-hook.h
+++ b/gltests/fd-hook.h
@@ -1,5 +1,5 @@
 /* Hook for making making file descriptor functions close(), ioctl() 
extensible.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/fdopen.c b/gltests/fdopen.c
index eded1a6..b72c0e8 100644
--- a/gltests/fdopen.c
+++ b/gltests/fdopen.c
@@ -1,5 +1,5 @@
 /* Open a stream with a given file descriptor.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/fstat.c b/gltests/fstat.c
index ffcda9f..7a0521f 100644
--- a/gltests/fstat.c
+++ b/gltests/fstat.c
@@ -1,5 +1,5 @@
 /* fstat() replacement.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/getcwd-lgpl.c b/gltests/getcwd-lgpl.c
index 044c000..1e17e19 100644
--- a/gltests/getcwd-lgpl.c
+++ b/gltests/getcwd-lgpl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2015 Free Software Foundation, Inc.
    This file is part of gnulib.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gltests/getdtablesize.c b/gltests/getdtablesize.c
index f0c6271..03eb7ef 100644
--- a/gltests/getdtablesize.c
+++ b/gltests/getdtablesize.c
@@ -1,5 +1,5 @@
 /* getdtablesize() function for platforms that don't have it.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -84,32 +84,38 @@ getdtablesize (void)
   return dtablesize;
 }
 
-#elif HAVE_GETDTABLESIZE
+#else
 
+# include <limits.h>
 # include <sys/resource.h>
-# undef getdtablesize
 
-int
-rpl_getdtablesize(void)
-{
-  /* To date, this replacement is only compiled for Cygwin 1.7.25,
-     which auto-increased the RLIMIT_NOFILE soft limit until it
-     hits the compile-time constant hard limit of 3200.  Although
-     that version of cygwin supported a child process inheriting
-     a smaller soft limit, the smaller limit is not enforced, so
-     we might as well just report the hard limit.  */
-  struct rlimit lim;
-  if (!getrlimit (RLIMIT_NOFILE, &lim) && lim.rlim_max != RLIM_INFINITY)
-    return lim.rlim_max;
-  return getdtablesize ();
-}
+# ifndef RLIM_SAVED_CUR
+#  define RLIM_SAVED_CUR RLIM_INFINITY
+# endif
+# ifndef RLIM_SAVED_MAX
+#  define RLIM_SAVED_MAX RLIM_INFINITY
+# endif
 
-#elif defined _SC_OPEN_MAX
+# ifdef __CYGWIN__
+  /* Cygwin 1.7.25 auto-increases the RLIMIT_NOFILE soft limit until it
+     hits the compile-time constant hard limit of 3200.  We might as
+     well just report the hard limit.  */
+#  define rlim_cur rlim_max
+# endif
 
 int
 getdtablesize (void)
 {
-  return sysconf (_SC_OPEN_MAX);
+  struct rlimit lim;
+
+  if (getrlimit (RLIMIT_NOFILE, &lim) == 0
+      && 0 <= lim.rlim_cur && lim.rlim_cur <= INT_MAX
+      && lim.rlim_cur != RLIM_INFINITY
+      && lim.rlim_cur != RLIM_SAVED_CUR
+      && lim.rlim_cur != RLIM_SAVED_MAX)
+    return lim.rlim_cur;
+
+  return INT_MAX;
 }
 
 #endif
diff --git a/gltests/gettimeofday.c b/gltests/gettimeofday.c
index 8b2058e..e0e2e69 100644
--- a/gltests/gettimeofday.c
+++ b/gltests/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-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2015 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/gltests/ignore-value.h b/gltests/ignore-value.h
index 4dd0946..68521ed 100644
--- a/gltests/ignore-value.h
+++ b/gltests/ignore-value.h
@@ -1,6 +1,6 @@
 /* ignore a function return without a compiler warning
 
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/gltests/init.sh b/gltests/init.sh
index fbd293d..9f403c5 100644
--- a/gltests/init.sh
+++ b/gltests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2015 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
@@ -93,6 +93,27 @@ skip_ () { warn_ "$ME_: skipped test: $@"; Exit 77; }
 fatal_ () { warn_ "$ME_: hard error: $@"; Exit 99; }
 framework_failure_ () { warn_ "$ME_: set-up failure: $@"; Exit 99; }
 
+# This is used to simplify checking of the return value
+# which is useful when ensuring a command fails as desired.
+# I.e., just doing `command ... &&fail=1` will not catch
+# a segfault in command for example.  With this helper you
+# instead check an explicit exit code like
+#   returns_ 1 command ... || fail
+returns_ () {
+  # Disable tracing so it doesn't interfere with stderr of the wrapped command
+  { set +x; } 2>/dev/null
+
+  local exp_exit="$1"
+  shift
+  "$@"
+  test $? -eq $exp_exit && ret_=0 || ret_=1
+
+  if test "$VERBOSE" = yes && test "$gl_set_x_corrupts_stderr_" = false; then
+    set -x
+  fi
+  { return $ret_; } 2>/dev/null
+}
+
 # Sanitize this shell to POSIX mode, if possible.
 DUALCASE=1; export DUALCASE
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
diff --git a/gltests/inttypes.in.h b/gltests/inttypes.in.h
index 4b2a13b..13a72be 100644
--- a/gltests/inttypes.in.h
+++ b/gltests/inttypes.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2015 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
 
diff --git a/gltests/lstat.c b/gltests/lstat.c
index f70fd43..31dee13 100644
--- a/gltests/lstat.c
+++ b/gltests/lstat.c
@@ -1,6 +1,6 @@
 /* Work around a bug of lstat on some systems
 
-   Copyright (C) 1997-2006, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-2006, 2008-2015 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/gltests/macros.h b/gltests/macros.h
index 0d7e378..b6fdd1c 100644
--- a/gltests/macros.h
+++ b/gltests/macros.h
@@ -1,5 +1,5 @@
 /* Common macros used by gnulib tests.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2015 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/gltests/malloc.c b/gltests/malloc.c
index bc81c54..00800a2 100644
--- a/gltests/malloc.c
+++ b/gltests/malloc.c
@@ -1,6 +1,6 @@
 /* malloc() function that is glibc compatible.
 
-   Copyright (C) 1997-1998, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2015 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/gltests/malloca.c b/gltests/malloca.c
index 370551c..198a96c 100644
--- a/gltests/malloca.c
+++ b/gltests/malloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gltests/malloca.h b/gltests/malloca.h
index 5071e46..7a4190c 100644
--- a/gltests/malloca.h
+++ b/gltests/malloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gltests/open.c b/gltests/open.c
index d6f8e0d..95c7811 100644
--- a/gltests/open.c
+++ b/gltests/open.c
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/gltests/pathmax.h b/gltests/pathmax.h
index 33fc355..2f3b64f 100644
--- a/gltests/pathmax.h
+++ b/gltests/pathmax.h
@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2014 Free Software
+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2015 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gltests/putenv.c b/gltests/putenv.c
index b9f5079..925bb2f 100644
--- a/gltests/putenv.c
+++ b/gltests/putenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2014 Free Software
+/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2015 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
diff --git a/gltests/same-inode.h b/gltests/same-inode.h
index 584f606..ecc3049 100644
--- a/gltests/same-inode.h
+++ b/gltests/same-inode.h
@@ -1,6 +1,6 @@
 /* Determine whether two stat buffers refer to the same file.
 
-   Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2015 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/gltests/setenv.c b/gltests/setenv.c
index 06791a9..6b16fd5 100644
--- a/gltests/setenv.c
+++ b/gltests/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2015 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/gltests/signature.h b/gltests/signature.h
index 0ae64e7..0a6cf91 100644
--- a/gltests/signature.h
+++ b/gltests/signature.h
@@ -1,5 +1,5 @@
 /* Macro for checking that a function declaration is compliant.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/stat.c b/gltests/stat.c
index 35f4b0b..2209826 100644
--- a/gltests/stat.c
+++ b/gltests/stat.c
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/stdalign.in.h b/gltests/stdalign.in.h
new file mode 100644
index 0000000..a990050
--- /dev/null
+++ b/gltests/stdalign.in.h
@@ -0,0 +1,113 @@
+/* A substitute for ISO C11 <stdalign.h>.
+
+   Copyright 2011-2015 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, 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/>.  */
+
+/* Written by Paul Eggert and Bruno Haible.  */
+
+#ifndef _GL_STDALIGN_H
+#define _GL_STDALIGN_H
+
+/* ISO C11 <stdalign.h> for platforms that lack it.
+
+   References:
+   ISO C11 (latest free draft
+   <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1570.pdf>)
+   sections 6.5.3.4, 6.7.5, 7.15.
+   C++11 (latest free draft
+   <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf>)
+   section 18.10. */
+
+/* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment
+   requirement of a structure member (i.e., slot or field) that is of
+   type TYPE, as an integer constant expression.
+
+   This differs from GCC's __alignof__ operator, which can yield a
+   better-performing alignment for an object of that type.  For
+   example, on x86 with GCC, __alignof__ (double) and __alignof__
+   (long long) are 8, whereas alignof (double) and alignof (long long)
+   are 4 unless the option '-malign-double' is used.
+
+   The result cannot be used as a value for an 'enum' constant, if you
+   want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc.
+
+   Include <stddef.h> for offsetof.  */
+#include <stddef.h>
+
+/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
+   standard headers, defines conflicting implementations of _Alignas
+   and _Alignof that are no better than ours; override them.  */
+#undef _Alignas
+#undef _Alignof
+
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
+# ifdef __cplusplus
+#  if 201103 <= __cplusplus
+#   define _Alignof(type) alignof (type)
+#  else
+   template <class __t> struct __alignof_helper { char __a; __t __b; };
+#   define _Alignof(type) offsetof (__alignof_helper<type>, __b)
+#  endif
+# else
+#  define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
+# endif
+#endif
+#define alignof _Alignof
+#define __alignof_is_defined 1
+
+/* alignas (A), also known as _Alignas (A), aligns a variable or type
+   to the alignment A, where A is an integer constant expression.  For
+   example:
+
+      int alignas (8) foo;
+      struct s { int a; int alignas (8) bar; };
+
+   aligns the address of FOO and the offset of BAR to be multiples of 8.
+
+   A should be a power of two that is at least the type's alignment
+   and at most the implementation's alignment limit.  This limit is
+   2**28 on typical GNUish hosts, and 2**13 on MSVC.  To be portable
+   to MSVC through at least version 10.0, A should be an integer
+   constant, as MSVC does not support expressions such as 1 << 3.
+   To be portable to Sun C 5.11, do not align auto variables to
+   anything stricter than their default alignment.
+
+   The following C11 requirements are not supported here:
+
+     - If A is zero, alignas has no effect.
+     - alignas can be used multiple times; the strictest one wins.
+     - alignas (TYPE) is equivalent to alignas (alignof (TYPE)).
+
+   */
+
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
+# if defined __cplusplus && 201103 <= __cplusplus
+#  define _Alignas(a) alignas (a)
+# elif ((defined __APPLE__ && defined __MACH__                  \
+         ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__)                 \
+         : __GNUC__)                                            \
+        || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__        \
+        || __ICC || 0x5110 <= __SUNPRO_C)
+#  define _Alignas(a) __attribute__ ((__aligned__ (a)))
+# elif 1300 <= _MSC_VER
+#  define _Alignas(a) __declspec (align (a))
+# endif
+#endif
+#if defined _Alignas || (defined __STDC_VERSION && 201112 <= __STDC_VERSION__)
+# define alignas _Alignas
+# define __alignas_is_defined 1
+#endif
+
+#endif /* _GL_STDALIGN_H */
diff --git a/gltests/stdbool.in.h b/gltests/stdbool.in.h
index 651e8df..64a1761 100644
--- a/gltests/stdbool.in.h
+++ b/gltests/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2001.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gltests/stdint.in.h b/gltests/stdint.in.h
index 247f0d8..378de2e 100644
--- a/gltests/stdint.in.h
+++ b/gltests/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2015 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
diff --git a/gltests/stdlib.in.h b/gltests/stdlib.in.h
index 46e10db..428a119 100644
--- a/gltests/stdlib.in.h
+++ b/gltests/stdlib.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2015 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
@@ -520,6 +520,29 @@ _GL_CXXALIAS_SYS (putenv, int, (char *string));
 _GL_CXXALIASWARN (putenv);
 #endif
 
+#if @GNULIB_QSORT_R@
+# if @REPLACE_QSORT_R@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef qsort_r
+#   define qsort_r rpl_qsort_r
+#  endif
+_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg) _GL_ARG_NONNULL ((1, 4)));
+_GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg));
+# else
+_GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg));
+# endif
+_GL_CXXALIASWARN (qsort_r);
+#endif
+
 
 #if @GNULIB_RANDOM_R@
 # if address@hidden@
diff --git a/gltests/symlink.c b/gltests/symlink.c
index 0e3fae2..14356c3 100644
--- a/gltests/symlink.c
+++ b/gltests/symlink.c
@@ -1,5 +1,5 @@
 /* Stub for symlink().
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/sys_stat.in.h b/gltests/sys_stat.in.h
index b47a7ff..9f5e853 100644
--- a/gltests/sys_stat.in.h
+++ b/gltests/sys_stat.in.h
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat header file.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2015 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/gltests/sys_time.in.h b/gltests/sys_time.in.h
index 30057ad..c556c5d 100644
--- a/gltests/sys_time.in.h
+++ b/gltests/sys_time.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/time.h.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/gltests/test-alloca-opt.c b/gltests/test-alloca-opt.c
index 3d8acc4..c189cc6 100644
--- a/gltests/test-alloca-opt.c
+++ b/gltests/test-alloca-opt.c
@@ -1,5 +1,5 @@
 /* Test of optional automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2015 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/gltests/test-binary-io.c b/gltests/test-binary-io.c
index 1b29fbd..9c3f8f2 100644
--- a/gltests/test-binary-io.c
+++ b/gltests/test-binary-io.c
@@ -1,5 +1,5 @@
 /* Test of binary mode I/O.
-   Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2015 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/gltests/test-close.c b/gltests/test-close.c
index 44bce54..457a7bc 100644
--- a/gltests/test-close.c
+++ b/gltests/test-close.c
@@ -1,5 +1,5 @@
 /* Test closing a file or socket.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/test-dup2.c b/gltests/test-dup2.c
index c7cb965..be475ea 100644
--- a/gltests/test-dup2.c
+++ b/gltests/test-dup2.c
@@ -1,5 +1,5 @@
 /* Test duplicating file descriptors.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/test-environ.c b/gltests/test-environ.c
index 46a2eab..e4616da 100644
--- a/gltests/test-environ.c
+++ b/gltests/test-environ.c
@@ -1,5 +1,5 @@
 /* Test of environ variable.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/gltests/test-errno.c b/gltests/test-errno.c
index 495242b..fab35d0 100644
--- a/gltests/test-errno.c
+++ b/gltests/test-errno.c
@@ -1,5 +1,5 @@
 /* Test of <errno.h> substitute.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/gltests/test-fdopen.c b/gltests/test-fdopen.c
index 743511e..c4e0355 100644
--- a/gltests/test-fdopen.c
+++ b/gltests/test-fdopen.c
@@ -1,5 +1,5 @@
 /* Test opening a stream with a file descriptor.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/test-fgetc.c b/gltests/test-fgetc.c
index 2534d4b..63e1e4a 100644
--- a/gltests/test-fgetc.c
+++ b/gltests/test-fgetc.c
@@ -1,5 +1,5 @@
 /* Test of fgetc() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/test-fputc.c b/gltests/test-fputc.c
index befb582..41ae096 100644
--- a/gltests/test-fputc.c
+++ b/gltests/test-fputc.c
@@ -1,5 +1,5 @@
 /* Test of fputc() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/test-fread.c b/gltests/test-fread.c
index 72b93a9..41cea56 100644
--- a/gltests/test-fread.c
+++ b/gltests/test-fread.c
@@ -1,5 +1,5 @@
 /* Test of fread() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/test-fstat.c b/gltests/test-fstat.c
index 9b793c9..7f39363 100644
--- a/gltests/test-fstat.c
+++ b/gltests/test-fstat.c
@@ -1,5 +1,5 @@
 /* Tests of fstat() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/test-fwrite.c b/gltests/test-fwrite.c
index e51b2ab..df4114c 100644
--- a/gltests/test-fwrite.c
+++ b/gltests/test-fwrite.c
@@ -1,5 +1,5 @@
 /* Test of fwrite() function.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/test-getcwd-lgpl.c b/gltests/test-getcwd-lgpl.c
index 371c8df..de1728b 100644
--- a/gltests/test-getcwd-lgpl.c
+++ b/gltests/test-getcwd-lgpl.c
@@ -1,5 +1,5 @@
 /* Test of getcwd() function.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/test-getdtablesize.c b/gltests/test-getdtablesize.c
index 86a0b4f..a0325af 100644
--- a/gltests/test-getdtablesize.c
+++ b/gltests/test-getdtablesize.c
@@ -1,5 +1,5 @@
 /* Test of getdtablesize() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/gltests/test-getopt.c b/gltests/test-getopt.c
index 152efea..a0ae340 100644
--- a/gltests/test-getopt.c
+++ b/gltests/test-getopt.c
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/test-getopt.h b/gltests/test-getopt.h
index c982d57..caaaa31 100644
--- a/gltests/test-getopt.h
+++ b/gltests/test-getopt.h
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/test-getopt_long.h b/gltests/test-getopt_long.h
index 07ea4a2..1094f3c 100644
--- a/gltests/test-getopt_long.h
+++ b/gltests/test-getopt_long.h
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/test-gettimeofday.c b/gltests/test-gettimeofday.c
index 5abb872..3b15f12 100644
--- a/gltests/test-gettimeofday.c
+++ b/gltests/test-gettimeofday.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc.
  * Written by Jim Meyering.
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gltests/test-ignore-value.c b/gltests/test-ignore-value.c
index 3533d7c..fc98860 100644
--- a/gltests/test-ignore-value.c
+++ b/gltests/test-ignore-value.c
@@ -1,6 +1,6 @@
 /* Test the "ignore-value" module.
 
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/test-init.sh b/gltests/test-init.sh
index be447b3..0875a75 100755
--- a/gltests/test-init.sh
+++ b/gltests/test-init.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Unit tests for init.sh
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2015 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gltests/test-intprops.c b/gltests/test-intprops.c
index 97553e7..06df5a7 100644
--- a/gltests/test-intprops.c
+++ b/gltests/test-intprops.c
@@ -1,5 +1,5 @@
 /* Test intprops.h.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/test-inttypes.c b/gltests/test-inttypes.c
index 35deeab..7fa18b2 100644
--- a/gltests/test-inttypes.c
+++ b/gltests/test-inttypes.c
@@ -1,5 +1,5 @@
 /* Test of <inttypes.h> substitute.
-   Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2015 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/gltests/test-lstat.c b/gltests/test-lstat.c
index eab2ad4..0e7597e 100644
--- a/gltests/test-lstat.c
+++ b/gltests/test-lstat.c
@@ -1,5 +1,5 @@
 /* Test of lstat() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/gltests/test-lstat.h b/gltests/test-lstat.h
index 45ca3bf..d5ba7a8 100644
--- a/gltests/test-lstat.h
+++ b/gltests/test-lstat.h
@@ -1,5 +1,5 @@
 /* Test of lstat() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/gltests/test-malloca.c b/gltests/test-malloca.c
index 6f94d0d..717ede0 100644
--- a/gltests/test-malloca.c
+++ b/gltests/test-malloca.c
@@ -1,5 +1,5 @@
 /* Test of safe automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2015 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/gltests/test-open.c b/gltests/test-open.c
index 985d901..d169e22 100644
--- a/gltests/test-open.c
+++ b/gltests/test-open.c
@@ -1,5 +1,5 @@
 /* Test of opening a file descriptor.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/gltests/test-open.h b/gltests/test-open.h
index 1807c90..2fbcd17 100644
--- a/gltests/test-open.h
+++ b/gltests/test-open.h
@@ -1,5 +1,5 @@
 /* Test of opening a file descriptor.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/gltests/test-pathmax.c b/gltests/test-pathmax.c
index 8bc7dbc..14eb1ee 100644
--- a/gltests/test-pathmax.c
+++ b/gltests/test-pathmax.c
@@ -1,5 +1,5 @@
 /* Test of "pathmax.h".
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/test-setenv.c b/gltests/test-setenv.c
index 548e4fb..a7ef488 100644
--- a/gltests/test-setenv.c
+++ b/gltests/test-setenv.c
@@ -1,5 +1,5 @@
 /* Tests of setenv.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/test-stat.c b/gltests/test-stat.c
index 9ed462a..c6af376 100644
--- a/gltests/test-stat.c
+++ b/gltests/test-stat.c
@@ -1,5 +1,5 @@
 /* Tests of stat.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/test-stat.h b/gltests/test-stat.h
index 6cfc958..c37fe6d 100644
--- a/gltests/test-stat.h
+++ b/gltests/test-stat.h
@@ -1,5 +1,5 @@
 /* Tests of stat.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/test-stdalign.c b/gltests/test-stdalign.c
new file mode 100644
index 0000000..68b9ef1
--- /dev/null
+++ b/gltests/test-stdalign.c
@@ -0,0 +1,116 @@
+/* Test of <stdalign.h>.
+   Copyright 2009-2015 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/>.  */
+
+/* Written by Paul Eggert, inspired by Bruno Haible's test-alignof.c.  */
+
+#include <config.h>
+
+#include <stdalign.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "verify.h"
+
+#include "macros.h"
+
+typedef long double longdouble;
+typedef struct { char a[1]; } struct1;
+typedef struct { char a[2]; } struct2;
+typedef struct { char a[3]; } struct3;
+typedef struct { char a[4]; } struct4;
+
+verify (__alignof_is_defined == 1);
+#ifndef alignof
+# error "alignof is not a macro"
+#endif
+
+#if __alignas_is_defined
+verify (__alignas_is_defined == 1);
+# ifndef alignas
+#  error "alignas is not a macro"
+# endif
+/* mingw can go up only to 8.  8 is all that GNU Emacs needs, so let's
+   limit the test to 8 for now.  */
+# define TEST_ALIGNMENT 8
+#else
+# define _Alignas(alignment)
+# define alignas(alignment)
+# define TEST_ALIGNMENT 1
+#endif
+
+#define CHECK_STATIC(type) \
+  typedef struct { char slot1; type slot2; } type##_helper; \
+  verify (alignof (type) == offsetof (type##_helper, slot2)); \
+  verify (_Alignof (type) == alignof (type)); \
+  const int type##_alignment = alignof (type); \
+  type alignas (TEST_ALIGNMENT) static_##type##_alignas; \
+  type _Alignas (TEST_ALIGNMENT) static_##type##_Alignas
+
+#define CHECK_ALIGNED(var) ASSERT ((uintptr_t) &(var) % TEST_ALIGNMENT == 0)
+
+CHECK_STATIC (char);
+CHECK_STATIC (short);
+CHECK_STATIC (int);
+CHECK_STATIC (long);
+#ifdef INT64_MAX
+CHECK_STATIC (int64_t);
+#endif
+CHECK_STATIC (float);
+CHECK_STATIC (double);
+/* CHECK_STATIC (longdouble); */
+CHECK_STATIC (struct1);
+CHECK_STATIC (struct2);
+CHECK_STATIC (struct3);
+CHECK_STATIC (struct4);
+
+int
+main ()
+{
+#if defined __SUNPRO_C
+  /* Avoid a test failure due to Sun Studio Developer Bug Report #2125432.  */
+  fputs ("Skipping test: known Sun C compiler bug\n", stderr);
+  return 77;
+#else
+  CHECK_ALIGNED (static_char_alignas);
+  CHECK_ALIGNED (static_char_Alignas);
+  CHECK_ALIGNED (static_short_alignas);
+  CHECK_ALIGNED (static_short_Alignas);
+  CHECK_ALIGNED (static_int_alignas);
+  CHECK_ALIGNED (static_int_Alignas);
+  CHECK_ALIGNED (static_long_alignas);
+  CHECK_ALIGNED (static_long_Alignas);
+# ifdef INT64_MAX
+  CHECK_ALIGNED (static_int64_t_alignas);
+  CHECK_ALIGNED (static_int64_t_Alignas);
+# endif
+  CHECK_ALIGNED (static_float_alignas);
+  CHECK_ALIGNED (static_float_Alignas);
+  CHECK_ALIGNED (static_double_alignas);
+  CHECK_ALIGNED (static_double_Alignas);
+  /* CHECK_ALIGNED (static_longdouble_alignas); */
+  /* CHECK_ALIGNED (static_longdouble_Alignas); */
+  CHECK_ALIGNED (static_struct1_alignas);
+  CHECK_ALIGNED (static_struct1_Alignas);
+  CHECK_ALIGNED (static_struct2_alignas);
+  CHECK_ALIGNED (static_struct2_Alignas);
+  CHECK_ALIGNED (static_struct3_alignas);
+  CHECK_ALIGNED (static_struct3_Alignas);
+  CHECK_ALIGNED (static_struct4_alignas);
+  CHECK_ALIGNED (static_struct4_Alignas);
+  return 0;
+#endif
+}
diff --git a/gltests/test-stdbool.c b/gltests/test-stdbool.c
index efa8324..1da25d0 100644
--- a/gltests/test-stdbool.c
+++ b/gltests/test-stdbool.c
@@ -1,5 +1,5 @@
 /* Test of <stdbool.h> substitute.
-   Copyright (C) 2002-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2007, 2009-2015 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/gltests/test-stddef.c b/gltests/test-stddef.c
index d5d887e..3179496 100644
--- a/gltests/test-stddef.c
+++ b/gltests/test-stddef.c
@@ -1,5 +1,5 @@
 /* Test of <stddef.h> substitute.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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
@@ -19,13 +19,14 @@
 #include <config.h>
 
 #include <stddef.h>
-
+#include <stdalign.h>
 #include "verify.h"
 
 /* Check that appropriate types are defined.  */
 wchar_t a = 'c';
 ptrdiff_t b = 1;
 size_t c = 2;
+max_align_t x;
 
 /* Check that NULL can be passed through varargs as a pointer type,
    per POSIX 2008.  */
@@ -45,6 +46,16 @@ verify (sizeof (offsetof (struct d, e)) == sizeof (size_t));
 verify (offsetof (struct d, e) < -1); /* Must be unsigned.  */
 verify (offsetof (struct d, f) == 1);
 
+/* Check max_align_t's alignment.  */
+verify (alignof (double) <= alignof (max_align_t));
+verify (alignof (int) <= alignof (max_align_t));
+verify (alignof (long double) <= alignof (max_align_t));
+verify (alignof (long int) <= alignof (max_align_t));
+verify (alignof (ptrdiff_t) <= alignof (max_align_t));
+verify (alignof (size_t) <= alignof (max_align_t));
+verify (alignof (wchar_t) <= alignof (max_align_t));
+verify (alignof (struct d) <= alignof (max_align_t));
+
 int
 main (void)
 {
diff --git a/gltests/test-stdint.c b/gltests/test-stdint.c
index 008b517..8d54db2 100644
--- a/gltests/test-stdint.c
+++ b/gltests/test-stdint.c
@@ -1,5 +1,5 @@
 /* Test of <stdint.h> substitute.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2015 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/gltests/test-stdio.c b/gltests/test-stdio.c
index d3f0e6b..cbec2a6 100644
--- a/gltests/test-stdio.c
+++ b/gltests/test-stdio.c
@@ -1,5 +1,5 @@
 /* Test of <stdio.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2015 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/gltests/test-strerror.c b/gltests/test-strerror.c
index 8e2ed7c..755ffba 100644
--- a/gltests/test-strerror.c
+++ b/gltests/test-strerror.c
@@ -1,5 +1,5 @@
 /* Test of strerror() function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/gltests/test-symlink.c b/gltests/test-symlink.c
index 78d46c2..7a63391 100644
--- a/gltests/test-symlink.c
+++ b/gltests/test-symlink.c
@@ -1,5 +1,5 @@
 /* Tests of symlink.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/test-symlink.h b/gltests/test-symlink.h
index eb11cf6..4dc741a 100644
--- a/gltests/test-symlink.h
+++ b/gltests/test-symlink.h
@@ -1,5 +1,5 @@
 /* Tests of symlink.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/test-sys_time.c b/gltests/test-sys_time.c
index ea12c63..653ff46 100644
--- a/gltests/test-sys_time.c
+++ b/gltests/test-sys_time.c
@@ -1,5 +1,5 @@
 /* Test of <sys/time.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2015 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/gltests/test-sys_types.c b/gltests/test-sys_types.c
index ddcb6d2..1ef3b90 100644
--- a/gltests/test-sys_types.c
+++ b/gltests/test-sys_types.c
@@ -1,5 +1,5 @@
 /* Test of <sys/types.h> substitute.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/gltests/test-unsetenv.c b/gltests/test-unsetenv.c
index 50600a9..235e185 100644
--- a/gltests/test-unsetenv.c
+++ b/gltests/test-unsetenv.c
@@ -1,5 +1,5 @@
 /* Tests of unsetenv.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/gltests/test-vc-list-files-cvs.sh 
b/gltests/test-vc-list-files-cvs.sh
index 51d3560..a2a237f 100755
--- a/gltests/test-vc-list-files-cvs.sh
+++ b/gltests/test-vc-list-files-cvs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Unit tests for vc-list-files
-# Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# Copyright (C) 2008-2015 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gltests/test-vc-list-files-git.sh 
b/gltests/test-vc-list-files-git.sh
index b31f99a..2882d32 100755
--- a/gltests/test-vc-list-files-git.sh
+++ b/gltests/test-vc-list-files-git.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Unit tests for vc-list-files
-# Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# Copyright (C) 2008-2015 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gltests/test-verify.c b/gltests/test-verify.c
index 2a41eb1..640dc42 100644
--- a/gltests/test-verify.c
+++ b/gltests/test-verify.c
@@ -1,6 +1,6 @@
 /* Test the "verify" module.
 
-   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2015 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/gltests/test-version-etc.c b/gltests/test-version-etc.c
index d94f63f..1f202e8 100644
--- a/gltests/test-version-etc.c
+++ b/gltests/test-version-etc.c
@@ -1,5 +1,5 @@
 /* Test suite for version-etc.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
    This file is part of the GNUlib Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gltests/test-version-etc.sh b/gltests/test-version-etc.sh
index c41f7ac..0ad212b 100755
--- a/gltests/test-version-etc.sh
+++ b/gltests/test-version-etc.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for version-etc.
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2015 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gltests/time.in.h b/gltests/time.in.h
index 81abdf4..1a6b746 100644
--- a/gltests/time.in.h
+++ b/gltests/time.in.h
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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
@@ -55,6 +55,8 @@
 #   include <sys/time.h>
 #  elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 #   include <pthread.h>
+#  elif @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
+#   include <unistd.h>
 #  else
 
 #   ifdef __cplusplus
diff --git a/gltests/unsetenv.c b/gltests/unsetenv.c
index 53721fc..87f41d5 100644
--- a/gltests/unsetenv.c
+++ b/gltests/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2002, 2005-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2002, 2005-2015 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/gltests/version-etc-fsf.c b/gltests/version-etc-fsf.c
index b37dd60..ad78d0d 100644
--- a/gltests/version-etc-fsf.c
+++ b/gltests/version-etc-fsf.c
@@ -1,5 +1,5 @@
 /* Variable with FSF copyright information, for version-etc.
-   Copyright (C) 1999-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2006, 2009-2015 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/gltests/wchar.in.h b/gltests/wchar.in.h
index 473285f..fc06d27 100644
--- a/gltests/wchar.in.h
+++ b/gltests/wchar.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/java/Makefile.am b/java/Makefile.am
index 84b45dd..b0fd6de 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Simon Josefsson
+# Copyright (C) 2004-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/src/Makefile.am b/java/src/Makefile.am
index 9ceff24..8739d4f 100644
--- a/java/src/Makefile.am
+++ b/java/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Simon Josefsson
+# Copyright (C) 2004-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/src/main/Makefile.am b/java/src/main/Makefile.am
index 7752991..a651494 100644
--- a/java/src/main/Makefile.am
+++ b/java/src/main/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Simon Josefsson
+# Copyright (C) 2004-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/src/main/java/Makefile.am b/java/src/main/java/Makefile.am
index af67061..cf2eb64 100644
--- a/java/src/main/java/Makefile.am
+++ b/java/src/main/java/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Simon Josefsson
+# Copyright (C) 2004-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/src/main/java/gnu/Makefile.am 
b/java/src/main/java/gnu/Makefile.am
index fe9953e..8500102 100644
--- a/java/src/main/java/gnu/Makefile.am
+++ b/java/src/main/java/gnu/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Simon Josefsson
+# Copyright (C) 2004-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/src/main/java/gnu/inet/Makefile.am 
b/java/src/main/java/gnu/inet/Makefile.am
index a36a82f..d372f7c 100644
--- a/java/src/main/java/gnu/inet/Makefile.am
+++ b/java/src/main/java/gnu/inet/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Simon Josefsson
+# Copyright (C) 2004-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/src/main/java/gnu/inet/encoding/IDNA.java 
b/java/src/main/java/gnu/inet/encoding/IDNA.java
index b4e9039..650f4e3 100644
--- a/java/src/main/java/gnu/inet/encoding/IDNA.java
+++ b/java/src/main/java/gnu/inet/encoding/IDNA.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Author: Oliver Hitz
 
    This file is part of GNU Libidn.
diff --git a/java/src/main/java/gnu/inet/encoding/IDNAException.java 
b/java/src/main/java/gnu/inet/encoding/IDNAException.java
index 68d9e42..1488be1 100644
--- a/java/src/main/java/gnu/inet/encoding/IDNAException.java
+++ b/java/src/main/java/gnu/inet/encoding/IDNAException.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Author: Oliver Hitz
 
    This file is part of GNU Libidn.
diff --git a/java/src/main/java/gnu/inet/encoding/Makefile.am 
b/java/src/main/java/gnu/inet/encoding/Makefile.am
index fb679de..bc9de46 100644
--- a/java/src/main/java/gnu/inet/encoding/Makefile.am
+++ b/java/src/main/java/gnu/inet/encoding/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Simon Josefsson
+# Copyright (C) 2004-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/src/main/java/gnu/inet/encoding/NFKC.java 
b/java/src/main/java/gnu/inet/encoding/NFKC.java
index 795c20e..a2cb78b 100644
--- a/java/src/main/java/gnu/inet/encoding/NFKC.java
+++ b/java/src/main/java/gnu/inet/encoding/NFKC.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Author: Oliver Hitz
 
    This file is part of GNU Libidn.
diff --git a/java/src/main/java/gnu/inet/encoding/Punycode.java 
b/java/src/main/java/gnu/inet/encoding/Punycode.java
index b45374b..32aa48a 100644
--- a/java/src/main/java/gnu/inet/encoding/Punycode.java
+++ b/java/src/main/java/gnu/inet/encoding/Punycode.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Author: Oliver Hitz
 
    This file is part of GNU Libidn.
diff --git a/java/src/main/java/gnu/inet/encoding/PunycodeException.java 
b/java/src/main/java/gnu/inet/encoding/PunycodeException.java
index c5f437e..b4d1717 100644
--- a/java/src/main/java/gnu/inet/encoding/PunycodeException.java
+++ b/java/src/main/java/gnu/inet/encoding/PunycodeException.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Author: Oliver Hitz
 
    This file is part of GNU Libidn.
diff --git a/java/src/main/java/gnu/inet/encoding/RangeSet.java 
b/java/src/main/java/gnu/inet/encoding/RangeSet.java
index 2d786e6..432ee8b 100644
--- a/java/src/main/java/gnu/inet/encoding/RangeSet.java
+++ b/java/src/main/java/gnu/inet/encoding/RangeSet.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2013-2015 Free Software Foundation, Inc.
    Author: Stefan Larsson
 
    This file is part of GNU Libidn.
diff --git a/java/src/main/java/gnu/inet/encoding/Stringprep.java 
b/java/src/main/java/gnu/inet/encoding/Stringprep.java
index ae0e382..6a7c091 100644
--- a/java/src/main/java/gnu/inet/encoding/Stringprep.java
+++ b/java/src/main/java/gnu/inet/encoding/Stringprep.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Author: Oliver Hitz
 
    This file is part of GNU Libidn.
diff --git a/java/src/main/java/gnu/inet/encoding/StringprepException.java 
b/java/src/main/java/gnu/inet/encoding/StringprepException.java
index bb01034..b753d2a 100644
--- a/java/src/main/java/gnu/inet/encoding/StringprepException.java
+++ b/java/src/main/java/gnu/inet/encoding/StringprepException.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Author: Oliver Hitz
 
    This file is part of GNU Libidn.
diff --git a/java/src/test/Makefile.am b/java/src/test/Makefile.am
index 7752991..a651494 100644
--- a/java/src/test/Makefile.am
+++ b/java/src/test/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Simon Josefsson
+# Copyright (C) 2004-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/src/test/java/Makefile.am b/java/src/test/java/Makefile.am
index 079810a..10f86dc 100644
--- a/java/src/test/java/Makefile.am
+++ b/java/src/test/java/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/src/test/java/gnu/inet/encoding/RangeSetTest.java 
b/java/src/test/java/gnu/inet/encoding/RangeSetTest.java
index 14bb2d2..547b3bd 100644
--- a/java/src/test/java/gnu/inet/encoding/RangeSetTest.java
+++ b/java/src/test/java/gnu/inet/encoding/RangeSetTest.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2013-2015 Free Software Foundation, Inc.
    Author: Stefan Larsson
 
    This file is part of GNU Libidn.
diff --git a/java/src/test/java/gnu/inet/encoding/StringprepTest.java 
b/java/src/test/java/gnu/inet/encoding/StringprepTest.java
index 5e3f08f..0f4eb28 100644
--- a/java/src/test/java/gnu/inet/encoding/StringprepTest.java
+++ b/java/src/test/java/gnu/inet/encoding/StringprepTest.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2013-2015 Free Software Foundation, Inc.
    Author: Stefan Larsson
 
    This file is part of GNU Libidn.
diff --git 
a/java/src/test/java/gnu/inet/encoding/caliper/CaliperStringprep.java 
b/java/src/test/java/gnu/inet/encoding/caliper/CaliperStringprep.java
index e668e9d..18a0e3b 100644
--- a/java/src/test/java/gnu/inet/encoding/caliper/CaliperStringprep.java
+++ b/java/src/test/java/gnu/inet/encoding/caliper/CaliperStringprep.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2013-2015 Free Software Foundation, Inc.
    Author: Stefan Larsson
 
    This file is part of GNU Libidn.
diff --git a/java/src/util/Makefile.am b/java/src/util/Makefile.am
index 7752991..a651494 100644
--- a/java/src/util/Makefile.am
+++ b/java/src/util/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Simon Josefsson
+# Copyright (C) 2004-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/src/util/java/GenerateNFKC.java 
b/java/src/util/java/GenerateNFKC.java
index f09fd2d..9fc3568 100644
--- a/java/src/util/java/GenerateNFKC.java
+++ b/java/src/util/java/GenerateNFKC.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Author: Oliver Hitz
 
    This file is part of GNU Libidn.
diff --git a/java/src/util/java/GenerateRFC3454.java 
b/java/src/util/java/GenerateRFC3454.java
index ccdc52f..90e577c 100644
--- a/java/src/util/java/GenerateRFC3454.java
+++ b/java/src/util/java/GenerateRFC3454.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Author: Oliver Hitz
 
    This file is part of GNU Libidn.
diff --git a/java/src/util/java/Makefile.am b/java/src/util/java/Makefile.am
index a3cfe1c..6b7d0b3 100644
--- a/java/src/util/java/Makefile.am
+++ b/java/src/util/java/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/src/util/java/TestIDNA.java b/java/src/util/java/TestIDNA.java
index e3aeaa1..59b1652 100644
--- a/java/src/util/java/TestIDNA.java
+++ b/java/src/util/java/TestIDNA.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Author: Oliver Hitz
 
    This file is part of GNU Libidn.
diff --git a/java/src/util/java/TestNFKC.java b/java/src/util/java/TestNFKC.java
index 2f0dafa..b9ed604 100644
--- a/java/src/util/java/TestNFKC.java
+++ b/java/src/util/java/TestNFKC.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2004-2015 Free Software Foundation, Inc.
    Author: Oliver Hitz
 
    This file is part of GNU Libidn.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8c5315f..b42d0b3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002-2014 Simon Josefsson.
+# Copyright (C) 2002-2015 Simon Josefsson.
 # Copyright (C) 2004, 2010-2014 Free Software Foundation, Inc.
 #
 # This file is part of GNU Libidn.
diff --git a/lib/gen-stringprep-tables.pl b/lib/gen-stringprep-tables.pl
index 9c2da0c..47403aa 100755
--- a/lib/gen-stringprep-tables.pl
+++ b/lib/gen-stringprep-tables.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (C) 2002-2014 Simon Josefsson
+# Copyright (C) 2002-2015 Simon Josefsson
 
 # 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/lib/gen-tld-tables.pl b/lib/gen-tld-tables.pl
index f73f288..bbeea0a 100755
--- a/lib/gen-tld-tables.pl
+++ b/lib/gen-tld-tables.pl
@@ -2,7 +2,7 @@
 
 # Author: Thomas Jacob, Internet24.de
 
-# Copyright (C) 2004-2014 Simon Josefsson.
+# Copyright (C) 2004-2015 Simon Josefsson.
 # Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/lib/gen-unicode-tables.pl b/lib/gen-unicode-tables.pl
index 03c3582..fe94b2c 100755
--- a/lib/gen-unicode-tables.pl
+++ b/lib/gen-unicode-tables.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-#    Copyright (C) 2004-2014 Simon Josefsson
+#    Copyright (C) 2004-2015 Simon Josefsson
 #    Copyright (C) 1998, 1999 Tom Tromey
 #    Copyright (C) 2001 Red Hat Software
 
diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am
index b02a78d..e453192 100644
--- a/lib/gl/Makefile.am
+++ b/lib/gl/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 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
@@ -299,6 +299,7 @@ stddef.h: stddef.in.h $(top_builddir)/config.status
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
+             -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \
              -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
              -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
              < $(srcdir)/stddef.in.h; \
diff --git a/lib/gl/c-ctype.c b/lib/gl/c-ctype.c
index f043309..932d676 100644
--- a/lib/gl/c-ctype.c
+++ b/lib/gl/c-ctype.c
@@ -1,6 +1,6 @@
 /* Character handling in C locale.
 
-   Copyright 2000-2003, 2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright 2000-2003, 2006, 2009-2015 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
diff --git a/lib/gl/c-ctype.h b/lib/gl/c-ctype.h
index 50757ef..d57cf43 100644
--- a/lib/gl/c-ctype.h
+++ b/lib/gl/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-2014 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2015 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
diff --git a/lib/gl/c-strcase.h b/lib/gl/c-strcase.h
index a96dcb5..5292a0a 100644
--- a/lib/gl/c-strcase.h
+++ b/lib/gl/c-strcase.h
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2014 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2015 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gl/c-strcasecmp.c b/lib/gl/c-strcasecmp.c
index 6ebbc96..afff3e5 100644
--- a/lib/gl/c-strcasecmp.c
+++ b/lib/gl/c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/lib/gl/c-strncasecmp.c b/lib/gl/c-strncasecmp.c
index 1bf3a70..9bd6689 100644
--- a/lib/gl/c-strncasecmp.c
+++ b/lib/gl/c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/lib/gl/gettext.h b/lib/gl/gettext.h
index 3485dd9..39f90d4 100644
--- a/lib/gl/gettext.h
+++ b/lib/gl/gettext.h
@@ -1,5 +1,5 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2015 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gl/iconv.c b/lib/gl/iconv.c
index 802a1b7..00c01fb 100644
--- a/lib/gl/iconv.c
+++ b/lib/gl/iconv.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 1999-2001, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2001, 2007, 2009-2015 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/lib/gl/iconv.in.h b/lib/gl/iconv.in.h
index 0f210c9..564f591 100644
--- a/lib/gl/iconv.in.h
+++ b/lib/gl/iconv.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <iconv.h>.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/lib/gl/iconv_close.c b/lib/gl/iconv_close.c
index 18ff47e..4e377fd 100644
--- a/lib/gl/iconv_close.c
+++ b/lib/gl/iconv_close.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/lib/gl/iconv_open.c b/lib/gl/iconv_open.c
index 3f178c5..a7cf799 100644
--- a/lib/gl/iconv_open.c
+++ b/lib/gl/iconv_open.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/lib/gl/m4/00gnulib.m4 b/lib/gl/m4/00gnulib.m4
index 8eca551..c7103ed 100644
--- a/lib/gl/m4/00gnulib.m4
+++ b/lib/gl/m4/00gnulib.m4
@@ -1,5 +1,5 @@
 # 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/absolute-header.m4 b/lib/gl/m4/absolute-header.m4
index ce3e39e..bc19dfc 100644
--- a/lib/gl/m4/absolute-header.m4
+++ b/lib/gl/m4/absolute-header.m4
@@ -1,5 +1,5 @@
 # absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/alloca.m4 b/lib/gl/m4/alloca.m4
index d7bdea6..8408bed 100644
--- a/lib/gl/m4/alloca.m4
+++ b/lib/gl/m4/alloca.m4
@@ -1,5 +1,5 @@
 # alloca.m4 serial 14
-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2014 Free Software Foundation,
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2015 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/lib/gl/m4/codeset.m4 b/lib/gl/m4/codeset.m4
index d7de8d6..1c52ffc 100644
--- a/lib/gl/m4/codeset.m4
+++ b/lib/gl/m4/codeset.m4
@@ -1,5 +1,5 @@
 # codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/eealloc.m4 b/lib/gl/m4/eealloc.m4
index 8a51fe7..322bdd5 100644
--- a/lib/gl/m4/eealloc.m4
+++ b/lib/gl/m4/eealloc.m4
@@ -1,5 +1,5 @@
 # eealloc.m4 serial 3
-dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/environ.m4 b/lib/gl/m4/environ.m4
index cfabe46..4dbf947 100644
--- a/lib/gl/m4/environ.m4
+++ b/lib/gl/m4/environ.m4
@@ -1,5 +1,5 @@
 # environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/extensions.m4 b/lib/gl/m4/extensions.m4
index 37f55ca..35bc49c 100644
--- a/lib/gl/m4/extensions.m4
+++ b/lib/gl/m4/extensions.m4
@@ -1,7 +1,7 @@
 # serial 13  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -68,6 +68,10 @@ dnl configure.ac when using autoheader 2.62.
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Use GNU style printf and scanf.  */
+#ifndef __USE_MINGW_ANSI_STDIO
+# undef __USE_MINGW_ANSI_STDIO
+#endif
 /* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
@@ -100,6 +104,7 @@ dnl configure.ac when using autoheader 2.62.
   AC_DEFINE([_ALL_SOURCE])
   AC_DEFINE([_DARWIN_C_SOURCE])
   AC_DEFINE([_GNU_SOURCE])
+  AC_DEFINE([__USE_MINGW_ANSI_STDIO])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
   AC_DEFINE([_TANDEM_SOURCE])
   AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined],
diff --git a/lib/gl/m4/extern-inline.m4 b/lib/gl/m4/extern-inline.m4
index 7f1bb39..e74339a 100644
--- a/lib/gl/m4/extern-inline.m4
+++ b/lib/gl/m4/extern-inline.m4
@@ -1,6 +1,6 @@
 dnl 'extern inline' a la ISO C99.
 
-dnl Copyright 2012-2014 Free Software Foundation, Inc.
+dnl Copyright 2012-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -74,6 +74,11 @@ AC_DEFUN([gl_EXTERN_INLINE],
 # define _GL_EXTERN_INLINE static _GL_UNUSED
 #endif
 
+/* In GCC, suppress bogus "no previous prototype for 'FOO'"
+   and "no previous declaration for 'FOO'" diagnostics,
+   when FOO is an inline function in the header; see
+   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113> and
+   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63877>.  */
 #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
 # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
 #  define _GL_INLINE_HEADER_CONST_PRAGMA
@@ -81,10 +86,6 @@ AC_DEFUN([gl_EXTERN_INLINE],
 #  define _GL_INLINE_HEADER_CONST_PRAGMA \
      _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
 # endif
-  /* Suppress GCC's bogus "no previous prototype for 'FOO'"
-     and "no previous declaration for 'FOO'"  diagnostics,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.  */
 # define _GL_INLINE_HEADER_BEGIN \
     _Pragma ("GCC diagnostic push") \
     _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
diff --git a/lib/gl/m4/gnulib-cache.m4 b/lib/gl/m4/gnulib-cache.m4
index d2e948d..16a70bb 100644
--- a/lib/gl/m4/gnulib-cache.m4
+++ b/lib/gl/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 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
diff --git a/lib/gl/m4/gnulib-common.m4 b/lib/gl/m4/gnulib-common.m4
index 35f6195..b301abe 100644
--- a/lib/gl/m4/gnulib-common.m4
+++ b/lib/gl/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 35
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 36
+dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -319,26 +319,28 @@ m4_ifdef([AC_PROG_MKDIR_P], [
 ])
 
 # AC_C_RESTRICT
-# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
-# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
-# works.
-# This definition can be removed once autoconf >= 2.62 can be assumed.
-# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness.
-m4_ifndef([AC_AUTOCONF_VERSION],[
+# This definition is copied from post-2.69 Autoconf and overrides the
+# AC_C_RESTRICT macro from autoconf 2.60..2.69.  It can be removed
+# once autoconf >= 2.70 can be assumed.  It's painful to check version
+# numbers, and in practice this macro is more up-to-date than Autoconf
+# is, so override Autoconf unconditionally.
 AC_DEFUN([AC_C_RESTRICT],
 [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
   [ac_cv_c_restrict=no
    # The order here caters to the fact that C++ does not require restrict.
    for ac_kw in __restrict __restrict__ _Restrict restrict; do
-     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-      [[typedef int * int_ptr;
-        int foo (int_ptr $ac_kw ip) {
-        return ip[0];
-       }]],
-      [[int s[1];
-        int * $ac_kw t = s;
-        t[0] = 0;
-        return foo(t)]])],
+     AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM(
+        [[typedef int *int_ptr;
+          int foo (int_ptr $ac_kw ip) { return ip[0]; }
+          int bar (int [$ac_kw]); /* Catch GCC bug 14050.  */
+          int bar (int ip[$ac_kw]) { return ip[0]; }
+        ]],
+        [[int s[1];
+          int *$ac_kw t = s;
+          t[0] = 0;
+          return foo (t) + bar (t);
+        ]])],
       [ac_cv_c_restrict=$ac_kw])
      test "$ac_cv_c_restrict" != no && break
    done
@@ -348,21 +350,21 @@ AC_DEFUN([AC_C_RESTRICT],
    nothing if this is not supported.  Do not define if restrict is
    supported directly.  */
 #undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict, even
-   though the corresponding Sun C compiler does, which causes
-   "#define restrict _Restrict" in the previous line.  Perhaps some future
-   version of Sun C++ will work with _Restrict; if so, it'll probably
-   define __RESTRICT, just as Sun C does.  */
+/* Work around a bug in Sun C++: it does not support _Restrict or
+   __restrict__, even though the corresponding Sun C compiler ends up with
+   "#define restrict _Restrict" or "#define restrict __restrict__" in the
+   previous line.  Perhaps some future version of Sun C++ will work with
+   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
 #if defined __SUNPRO_CC && !defined __RESTRICT
 # define _Restrict
+# define __restrict__
 #endif])
  case $ac_cv_c_restrict in
    restrict) ;;
    no) AC_DEFINE([restrict], []) ;;
    *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
  esac
-])
-])
+])# AC_C_RESTRICT
 
 # gl_BIGENDIAN
 # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
diff --git a/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4
index df1492a..83f0b0f 100644
--- a/lib/gl/m4/gnulib-comp.m4
+++ b/lib/gl/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 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
@@ -65,6 +65,8 @@ AC_DEFUN([lgl_EARLY],
   # Code from module inttypes:
   # Code from module inttypes-incomplete:
   # Code from module inttypes-tests:
+  # Code from module langinfo:
+  # Code from module langinfo-tests:
   # Code from module lib-msvc-compat:
   # Code from module lib-symbol-versions:
   # Code from module lib-symbol-visibility:
@@ -89,6 +91,8 @@ AC_DEFUN([lgl_EARLY],
   # Code from module snippet/unused-parameter:
   # Code from module snippet/warn-on-use:
   # Code from module ssize_t:
+  # Code from module stdalign:
+  # Code from module stdalign-tests:
   # Code from module stdbool:
   # Code from module stdbool-tests:
   # Code from module stddef:
@@ -177,12 +181,12 @@ AC_DEFUN([lgl_INIT],
   gl_STRING_MODULE_INDICATOR([strverscmp])
   gl_SYS_TYPES_H
   AC_PROG_MKDIR_P
-  gl_LIBUNISTRING_LIBHEADER([0.9.2], [unistr.h])
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [unistr.h])
   gl_MODULE_INDICATOR([unistr/u8-mbtoucr])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr])
   gl_MODULE_INDICATOR([unistr/u8-uctomb])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb])
-  gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h])
   # End of code from modules
   m4_ifval(lgl_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([lgl_LIBSOURCES_DIR])[ ||
@@ -236,6 +240,7 @@ changequote([, ])dnl
   gl_UNISTD_MODULE_INDICATOR([environ])
   gl_INTTYPES_H
   gl_INTTYPES_INCOMPLETE
+  gl_LANGINFO_H
   gl_LOCALE_H
   AC_CHECK_FUNCS_ONCE([newlocale])
   gl_LOCALENAME
@@ -269,6 +274,7 @@ changequote([, ])dnl
   gt_LOCALE_FR_UTF8
   gt_LOCALE_JA
   gt_LOCALE_ZH_CN
+  gl_STDALIGN_H
   AC_REQUIRE([gt_TYPE_WCHAR_T])
   AC_REQUIRE([gt_TYPE_WINT_T])
   gl_STDLIB_H
@@ -426,6 +432,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   m4/intlmacosx.m4
   m4/inttypes-pri.m4
   m4/inttypes.m4
+  m4/langinfo_h.m4
   m4/lcmessage.m4
   m4/ld-output-def.m4
   m4/ld-version-script.m4
@@ -449,6 +456,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   m4/setenv.m4
   m4/setlocale.m4
   m4/ssize_t.m4
+  m4/stdalign.m4
   m4/stdbool.m4
   m4/stddef_h.m4
   m4/stdint.m4
@@ -478,6 +486,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   tests/test-init.sh
   tests/test-intprops.c
   tests/test-inttypes.c
+  tests/test-langinfo.c
   tests/test-locale.c
   tests/test-localename.c
   tests/test-lock.c
@@ -487,6 +496,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   tests/test-setlocale1.sh
   tests/test-setlocale2.c
   tests/test-setlocale2.sh
+  tests/test-stdalign.c
   tests/test-stdbool.c
   tests/test-stddef.c
   tests/test-stdint.c
@@ -512,6 +522,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   tests=lib/glthread/yield.h
   tests=lib/intprops.h
   tests=lib/inttypes.in.h
+  tests=lib/langinfo.in.h
   tests=lib/locale.in.h
   tests=lib/localename.c
   tests=lib/localename.h
@@ -522,6 +533,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   tests=lib/putenv.c
   tests=lib/setenv.c
   tests=lib/setlocale.c
+  tests=lib/stdalign.in.h
   tests=lib/stdlib.in.h
   tests=lib/unistd.c
   tests=lib/unistd.in.h
diff --git a/lib/gl/m4/gnulib-tool.m4 b/lib/gl/m4/gnulib-tool.m4
index a588e15..fede1fc 100644
--- a/lib/gl/m4/gnulib-tool.m4
+++ b/lib/gl/m4/gnulib-tool.m4
@@ -1,5 +1,5 @@
 # gnulib-tool.m4 serial 2
-dnl Copyright (C) 2004-2005, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/iconv.m4 b/lib/gl/m4/iconv.m4
index 4b29c5f..5a6c29b 100644
--- a/lib/gl/m4/iconv.m4
+++ b/lib/gl/m4/iconv.m4
@@ -1,5 +1,5 @@
-# iconv.m4 serial 18 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
+# iconv.m4 serial 19 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -72,27 +72,33 @@ AC_DEFUN([AM_ICONV_LINK],
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
+      am_cv_func_iconv_works=no
+      for ac_iconv_const in '' 'const'; do
+        AC_RUN_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[
 #include <iconv.h>
 #include <string.h>
-int main ()
-{
-  int result = 0;
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+             ]],
+             [[int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
     iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
     if (cd_utf8_to_88591 != (iconv_t)(-1))
       {
-        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
         char buf[10];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
           result |= 1;
@@ -105,14 +111,14 @@ int main ()
     iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
     if (cd_ascii_to_88591 != (iconv_t)(-1))
       {
-        static const char input[] = "\263";
+        static ICONV_CONST char input[] = "\263";
         char buf[10];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_ascii_to_88591,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
           result |= 2;
@@ -124,14 +130,14 @@ int main ()
     iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
     if (cd_88591_to_utf8 != (iconv_t)(-1))
       {
-        static const char input[] = "\304";
+        static ICONV_CONST char input[] = "\304";
         static char buf[2] = { (char)0xDE, (char)0xAD };
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = 1;
         char *outptr = buf;
         size_t outbytesleft = 1;
         size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
           result |= 4;
@@ -144,14 +150,14 @@ int main ()
     iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
     if (cd_88591_to_utf8 != (iconv_t)(-1))
       {
-        static const char input[] = "\304rger mit b\366sen B\374bchen ohne 
Augenma\337";
+        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen 
ohne Augenma\337";
         char buf[50];
-        const char *inptr = input;
+        ICONV_CONST char *inptr = input;
         size_t inbytesleft = strlen (input);
         char *outptr = buf;
         size_t outbytesleft = sizeof (buf);
         size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
+                            &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
           result |= 8;
@@ -171,17 +177,14 @@ int main ()
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
     result |= 16;
   return result;
-}]])],
-        [am_cv_func_iconv_works=yes],
-        [am_cv_func_iconv_works=no],
-        [
-changequote(,)dnl
-         case "$host_os" in
-           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-           *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac
-changequote([,])dnl
-        ])
+]])],
+          [am_cv_func_iconv_works=yes], ,
+          [case "$host_os" in
+             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+             *)            am_cv_func_iconv_works="guessing yes" ;;
+           esac])
+        test "$am_cv_func_iconv_works" = no || break
+      done
       LIBS="$am_save_LIBS"
     ])
     case "$am_cv_func_iconv_works" in
diff --git a/lib/gl/m4/iconv_h.m4 b/lib/gl/m4/iconv_h.m4
index e992fa3..c6878fa 100644
--- a/lib/gl/m4/iconv_h.m4
+++ b/lib/gl/m4/iconv_h.m4
@@ -1,5 +1,5 @@
 # iconv_h.m4 serial 8
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/iconv_open.m4 b/lib/gl/m4/iconv_open.m4
index e0bfd72..177fccb 100644
--- a/lib/gl/m4/iconv_open.m4
+++ b/lib/gl/m4/iconv_open.m4
@@ -1,5 +1,5 @@
 # iconv_open.m4 serial 14
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/include_next.m4 b/lib/gl/m4/include_next.m4
index 69ad3db..233d254 100644
--- a/lib/gl/m4/include_next.m4
+++ b/lib/gl/m4/include_next.m4
@@ -1,5 +1,5 @@
 # include_next.m4 serial 23
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/inline.m4 b/lib/gl/m4/inline.m4
index c49957f..dc7063e 100644
--- a/lib/gl/m4/inline.m4
+++ b/lib/gl/m4/inline.m4
@@ -1,5 +1,5 @@
 # inline.m4 serial 4
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/intlmacosx.m4 b/lib/gl/m4/intlmacosx.m4
index 8a045f6..0d8d298 100644
--- a/lib/gl/m4/intlmacosx.m4
+++ b/lib/gl/m4/intlmacosx.m4
@@ -1,5 +1,5 @@
 # intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/inttypes-pri.m4 b/lib/gl/m4/inttypes-pri.m4
index 00251e1..0884e71 100644
--- a/lib/gl/m4/inttypes-pri.m4
+++ b/lib/gl/m4/inttypes-pri.m4
@@ -1,5 +1,5 @@
 # inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2002, 2006, 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/inttypes.m4 b/lib/gl/m4/inttypes.m4
index 2f9317d..4209ffd 100644
--- a/lib/gl/m4/inttypes.m4
+++ b/lib/gl/m4/inttypes.m4
@@ -1,5 +1,5 @@
 # inttypes.m4 serial 26
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/langinfo_h.m4 b/lib/gl/m4/langinfo_h.m4
new file mode 100644
index 0000000..c3ecba6
--- /dev/null
+++ b/lib/gl/m4/langinfo_h.m4
@@ -0,0 +1,105 @@
+# langinfo_h.m4 serial 7
+dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_LANGINFO_H],
+[
+  AC_REQUIRE([gl_LANGINFO_H_DEFAULTS])
+
+  dnl Persuade glibc-2.0.6 <langinfo.h> to define CODESET.
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  dnl <langinfo.h> is always overridden, because of GNULIB_POSIXCHECK.
+  gl_CHECK_NEXT_HEADERS([langinfo.h])
+
+  dnl Determine whether <langinfo.h> exists. It is missing on mingw and BeOS.
+  HAVE_LANGINFO_CODESET=0
+  HAVE_LANGINFO_T_FMT_AMPM=0
+  HAVE_LANGINFO_ERA=0
+  HAVE_LANGINFO_YESEXPR=0
+  AC_CHECK_HEADERS_ONCE([langinfo.h])
+  if test $ac_cv_header_langinfo_h = yes; then
+    HAVE_LANGINFO_H=1
+    dnl Determine what <langinfo.h> defines. CODESET and ERA etc. are missing
+    dnl on OpenBSD 3.8. T_FMT_AMPM and YESEXPR, NOEXPR are missing on IRIX 5.3.
+    AC_CACHE_CHECK([whether langinfo.h defines CODESET],
+      [gl_cv_header_langinfo_codeset],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[#include <langinfo.h>
+int a = CODESET;
+]])],
+         [gl_cv_header_langinfo_codeset=yes],
+         [gl_cv_header_langinfo_codeset=no])
+      ])
+    if test $gl_cv_header_langinfo_codeset = yes; then
+      HAVE_LANGINFO_CODESET=1
+    fi
+    AC_CACHE_CHECK([whether langinfo.h defines T_FMT_AMPM],
+      [gl_cv_header_langinfo_t_fmt_ampm],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[#include <langinfo.h>
+int a = T_FMT_AMPM;
+]])],
+         [gl_cv_header_langinfo_t_fmt_ampm=yes],
+         [gl_cv_header_langinfo_t_fmt_ampm=no])
+      ])
+    if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then
+      HAVE_LANGINFO_T_FMT_AMPM=1
+    fi
+    AC_CACHE_CHECK([whether langinfo.h defines ERA],
+      [gl_cv_header_langinfo_era],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[#include <langinfo.h>
+int a = ERA;
+]])],
+         [gl_cv_header_langinfo_era=yes],
+         [gl_cv_header_langinfo_era=no])
+      ])
+    if test $gl_cv_header_langinfo_era = yes; then
+      HAVE_LANGINFO_ERA=1
+    fi
+    AC_CACHE_CHECK([whether langinfo.h defines YESEXPR],
+      [gl_cv_header_langinfo_yesexpr],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[#include <langinfo.h>
+int a = YESEXPR;
+]])],
+         [gl_cv_header_langinfo_yesexpr=yes],
+         [gl_cv_header_langinfo_yesexpr=no])
+      ])
+    if test $gl_cv_header_langinfo_yesexpr = yes; then
+      HAVE_LANGINFO_YESEXPR=1
+    fi
+  else
+    HAVE_LANGINFO_H=0
+  fi
+  AC_SUBST([HAVE_LANGINFO_H])
+  AC_SUBST([HAVE_LANGINFO_CODESET])
+  AC_SUBST([HAVE_LANGINFO_T_FMT_AMPM])
+  AC_SUBST([HAVE_LANGINFO_ERA])
+  AC_SUBST([HAVE_LANGINFO_YESEXPR])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[#include <langinfo.h>
+    ]], [nl_langinfo])
+])
+
+AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_LANGINFO_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_LANGINFO_H_DEFAULTS],
+[
+  GNULIB_NL_LANGINFO=0;  AC_SUBST([GNULIB_NL_LANGINFO])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_NL_LANGINFO=1;    AC_SUBST([HAVE_NL_LANGINFO])
+  REPLACE_NL_LANGINFO=0; AC_SUBST([REPLACE_NL_LANGINFO])
+])
diff --git a/lib/gl/m4/lcmessage.m4 b/lib/gl/m4/lcmessage.m4
index 7470ec5..2fcce61 100644
--- a/lib/gl/m4/lcmessage.m4
+++ b/lib/gl/m4/lcmessage.m4
@@ -1,5 +1,5 @@
 # lcmessage.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014 Free Software Foundation,
+dnl Copyright (C) 1995-2002, 2004-2005, 2008-2015 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/lib/gl/m4/ld-output-def.m4 b/lib/gl/m4/ld-output-def.m4
index 19d7e9a..c505ab2 100644
--- a/lib/gl/m4/ld-output-def.m4
+++ b/lib/gl/m4/ld-output-def.m4
@@ -1,5 +1,5 @@
 # ld-output-def.m4 serial 2
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/ld-version-script.m4 b/lib/gl/m4/ld-version-script.m4
index f8b4a5c..211d67b 100644
--- a/lib/gl/m4/ld-version-script.m4
+++ b/lib/gl/m4/ld-version-script.m4
@@ -1,5 +1,5 @@
-# ld-version-script.m4 serial 3
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# ld-version-script.m4 serial 4
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,20 +18,18 @@ dnl From Simon Josefsson
 AC_DEFUN([gl_LD_VERSION_SCRIPT],
 [
   AC_ARG_ENABLE([ld-version-script],
-    AS_HELP_STRING([--enable-ld-version-script],
-      [enable linker version script (default is enabled when possible)]),
-      [have_ld_version_script=$enableval], [])
-  if test -z "$have_ld_version_script"; then
-    AC_MSG_CHECKING([if LD -Wl,--version-script works])
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-    cat > conftest.map <<EOF
-foo
-EOF
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-                   [accepts_syntax_errors=yes], [accepts_syntax_errors=no])
-    if test "$accepts_syntax_errors" = no; then
-      cat > conftest.map <<EOF
+    [AS_HELP_STRING([--enable-ld-version-script],
+       [enable linker version script (default is enabled when possible)])],
+    [have_ld_version_script=$enableval],
+    [AC_CACHE_CHECK([if LD -Wl,--version-script works],
+       [gl_cv_sys_ld_version_script],
+       [gl_cv_sys_ld_version_script=no
+        save_LDFLAGS=$LDFLAGS
+        LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
+        echo foo >conftest.map
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+          [],
+          [cat > conftest.map <<EOF
 VERS_1 {
         global: sym;
 };
@@ -40,14 +38,11 @@ VERS_2 {
         global: sym;
 } VERS_1;
 EOF
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-                     [have_ld_version_script=yes], [have_ld_version_script=no])
-    else
-      have_ld_version_script=no
-    fi
-    rm -f conftest.map
-    LDFLAGS="$save_LDFLAGS"
-    AC_MSG_RESULT($have_ld_version_script)
-  fi
-  AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = 
"yes")
+           AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+             [gl_cv_sys_ld_version_script=yes])])
+        rm -f conftest.map
+        LDFLAGS=$save_LDFLAGS])
+     have_ld_version_script=$gl_cv_sys_ld_version_script])
+  AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT],
+    [test "$have_ld_version_script" = yes])
 ])
diff --git a/lib/gl/m4/lib-ld.m4 b/lib/gl/m4/lib-ld.m4
index ddc569f..91ca911 100644
--- a/lib/gl/m4/lib-ld.m4
+++ b/lib/gl/m4/lib-ld.m4
@@ -1,5 +1,5 @@
 # lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/lib-link.m4 b/lib/gl/m4/lib-link.m4
index 3522d99..d8d5d1f 100644
--- a/lib/gl/m4/lib-link.m4
+++ b/lib/gl/m4/lib-link.m4
@@ -1,5 +1,5 @@
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/lib-prefix.m4 b/lib/gl/m4/lib-prefix.m4
index 31f49e4..0465f47 100644
--- a/lib/gl/m4/lib-prefix.m4
+++ b/lib/gl/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/libunistring-base.m4 b/lib/gl/m4/libunistring-base.m4
index d003267..cb8ae8a 100644
--- a/lib/gl/m4/libunistring-base.m4
+++ b/lib/gl/m4/libunistring-base.m4
@@ -1,5 +1,5 @@
 # libunistring-base.m4 serial 5
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/locale-fr.m4 b/lib/gl/m4/locale-fr.m4
index 27db5ab..92ff552 100644
--- a/lib/gl/m4/locale-fr.m4
+++ b/lib/gl/m4/locale-fr.m4
@@ -1,5 +1,5 @@
 # locale-fr.m4 serial 17
-dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/locale-ja.m4 b/lib/gl/m4/locale-ja.m4
index c88fe8b..a3abef8 100644
--- a/lib/gl/m4/locale-ja.m4
+++ b/lib/gl/m4/locale-ja.m4
@@ -1,5 +1,5 @@
 # locale-ja.m4 serial 12
-dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/locale-tr.m4 b/lib/gl/m4/locale-tr.m4
index 535b256..655c1ec 100644
--- a/lib/gl/m4/locale-tr.m4
+++ b/lib/gl/m4/locale-tr.m4
@@ -1,5 +1,5 @@
 # locale-tr.m4 serial 10
-dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/locale-zh.m4 b/lib/gl/m4/locale-zh.m4
index d3b2347..c5c4ef6 100644
--- a/lib/gl/m4/locale-zh.m4
+++ b/lib/gl/m4/locale-zh.m4
@@ -1,5 +1,5 @@
 # locale-zh.m4 serial 12
-dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/locale_h.m4 b/lib/gl/m4/locale_h.m4
index 2838588..0d7bb34 100644
--- a/lib/gl/m4/locale_h.m4
+++ b/lib/gl/m4/locale_h.m4
@@ -1,5 +1,5 @@
 # locale_h.m4 serial 19
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/localename.m4 b/lib/gl/m4/localename.m4
index d865c66..ef5dd5f 100644
--- a/lib/gl/m4/localename.m4
+++ b/lib/gl/m4/localename.m4
@@ -1,5 +1,5 @@
 # localename.m4 serial 2
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/lock.m4 b/lib/gl/m4/lock.m4
index 73a3c54..9fd4aa7 100644
--- a/lib/gl/m4/lock.m4
+++ b/lib/gl/m4/lock.m4
@@ -1,5 +1,5 @@
 # lock.m4 serial 13 (gettext-0.18.2)
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/longlong.m4 b/lib/gl/m4/longlong.m4
index eefb37c..d57bc70 100644
--- a/lib/gl/m4/longlong.m4
+++ b/lib/gl/m4/longlong.m4
@@ -1,5 +1,5 @@
 # longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/malloc.m4 b/lib/gl/m4/malloc.m4
index 322ad6e..31368ab 100644
--- a/lib/gl/m4/malloc.m4
+++ b/lib/gl/m4/malloc.m4
@@ -1,5 +1,5 @@
 # malloc.m4 serial 14
-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/malloca.m4 b/lib/gl/m4/malloca.m4
index dcc1a08..7248951 100644
--- a/lib/gl/m4/malloca.m4
+++ b/lib/gl/m4/malloca.m4
@@ -1,5 +1,5 @@
 # malloca.m4 serial 1
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2014 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2015 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/lib/gl/m4/multiarch.m4 b/lib/gl/m4/multiarch.m4
index 2cb956d..fc575c1 100644
--- a/lib/gl/m4/multiarch.m4
+++ b/lib/gl/m4/multiarch.m4
@@ -1,5 +1,5 @@
 # multiarch.m4 serial 7
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/off_t.m4 b/lib/gl/m4/off_t.m4
index f5885b3..0eb1467 100644
--- a/lib/gl/m4/off_t.m4
+++ b/lib/gl/m4/off_t.m4
@@ -1,5 +1,5 @@
 # off_t.m4 serial 1
-dnl Copyright (C) 2012-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/putenv.m4 b/lib/gl/m4/putenv.m4
index d79321b..73a5f46 100644
--- a/lib/gl/m4/putenv.m4
+++ b/lib/gl/m4/putenv.m4
@@ -1,5 +1,5 @@
 # putenv.m4 serial 20
-dnl Copyright (C) 2002-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/setenv.m4 b/lib/gl/m4/setenv.m4
index 0f46a7b..3aa38d8 100644
--- a/lib/gl/m4/setenv.m4
+++ b/lib/gl/m4/setenv.m4
@@ -1,5 +1,5 @@
 # setenv.m4 serial 26
-dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/setlocale.m4 b/lib/gl/m4/setlocale.m4
index fe83aab..6d153f9 100644
--- a/lib/gl/m4/setlocale.m4
+++ b/lib/gl/m4/setlocale.m4
@@ -1,5 +1,5 @@
 # setlocale.m4 serial 4
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/ssize_t.m4 b/lib/gl/m4/ssize_t.m4
index fbe1d06..25bd451 100644
--- a/lib/gl/m4/ssize_t.m4
+++ b/lib/gl/m4/ssize_t.m4
@@ -1,5 +1,5 @@
 # ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/stdalign.m4 b/lib/gl/m4/stdalign.m4
new file mode 100644
index 0000000..033b0d3
--- /dev/null
+++ b/lib/gl/m4/stdalign.m4
@@ -0,0 +1,57 @@
+# Check for stdalign.h that conforms to C11.
+
+dnl Copyright 2011-2015 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Prepare for substituting <stdalign.h> if it is not supported.
+
+AC_DEFUN([gl_STDALIGN_H],
+[
+  AC_CACHE_CHECK([for working stdalign.h],
+    [gl_cv_header_working_stdalign_h],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stdalign.h>
+            #include <stddef.h>
+
+            /* Test that alignof yields a result consistent with offsetof.
+               This catches GCC bug 52023
+               <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.  */
+            #ifdef __cplusplus
+               template <class t> struct alignof_helper { char a; t b; };
+            # define ao(type) offsetof (alignof_helper<type>, b)
+            #else
+            # define ao(type) offsetof (struct { char a; type b; }, b)
+            #endif
+            char test_double[ao (double) % _Alignof (double) == 0 ? 1 : -1];
+            char test_long[ao (long int) % _Alignof (long int) == 0 ? 1 : -1];
+            char test_alignof[alignof (double) == _Alignof (double) ? 1 : -1];
+
+            /* Test _Alignas only on platforms where gnulib can help.  */
+            #if \
+                ((defined __cplusplus && 201103 <= __cplusplus) \
+                 || (defined __APPLE__ && defined __MACH__ \
+                     ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
+                     : __GNUC__) \
+                 || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \
+                 || __ICC || 0x5110 <= __SUNPRO_C \
+                 || 1300 <= _MSC_VER)
+              struct alignas_test { char c; char alignas (8) alignas_8; };
+              char test_alignas[offsetof (struct alignas_test, alignas_8) == 8
+                                ? 1 : -1];
+            #endif
+          ]])],
+       [gl_cv_header_working_stdalign_h=yes],
+       [gl_cv_header_working_stdalign_h=no])])
+
+  if test $gl_cv_header_working_stdalign_h = yes; then
+    STDALIGN_H=''
+  else
+    STDALIGN_H='stdalign.h'
+  fi
+
+  AC_SUBST([STDALIGN_H])
+  AM_CONDITIONAL([GL_GENERATE_STDALIGN_H], [test -n "$STDALIGN_H"])
+])
diff --git a/lib/gl/m4/stdbool.m4 b/lib/gl/m4/stdbool.m4
index 006ed52..7273b82 100644
--- a/lib/gl/m4/stdbool.m4
+++ b/lib/gl/m4/stdbool.m4
@@ -1,6 +1,6 @@
 # Check for stdbool.h that conforms to C99.
 
-dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/stddef_h.m4 b/lib/gl/m4/stddef_h.m4
index c555e29..2310502 100644
--- a/lib/gl/m4/stddef_h.m4
+++ b/lib/gl/m4/stddef_h.m4
@@ -1,6 +1,6 @@
-dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
-# stddef_h.m4 serial 4
-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc.
+dnl A placeholder for <stddef.h>, for platforms that have issues.
+# stddef_h.m4 serial 5
+dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,6 +10,9 @@ AC_DEFUN([gl_STDDEF_H],
   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
   AC_REQUIRE([gt_TYPE_WCHAR_T])
   STDDEF_H=
+  AC_CHECK_TYPE([max_align_t], [], [HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h],
+    [[#include <stddef.h>
+    ]])
   if test $gt_cv_c_wchar_t = no; then
     HAVE_WCHAR_T=0
     STDDEF_H=stddef.h
@@ -43,5 +46,6 @@ AC_DEFUN([gl_STDDEF_H_DEFAULTS],
 [
   dnl Assume proper GNU behavior unless another module says otherwise.
   REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
+  HAVE_MAX_ALIGN_T=1;            AC_SUBST([HAVE_MAX_ALIGN_T])
   HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
 ])
diff --git a/lib/gl/m4/stdint.m4 b/lib/gl/m4/stdint.m4
index 1981d9d..4011a49 100644
--- a/lib/gl/m4/stdint.m4
+++ b/lib/gl/m4/stdint.m4
@@ -1,5 +1,5 @@
 # stdint.m4 serial 43
-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/stdlib_h.m4 b/lib/gl/m4/stdlib_h.m4
index 03b448b..0b4c623 100644
--- a/lib/gl/m4/stdlib_h.m4
+++ b/lib/gl/m4/stdlib_h.m4
@@ -1,5 +1,5 @@
 # stdlib_h.m4 serial 42
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -55,6 +55,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   GNULIB_PTSNAME=0;       AC_SUBST([GNULIB_PTSNAME])
   GNULIB_PTSNAME_R=0;     AC_SUBST([GNULIB_PTSNAME_R])
   GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
+  GNULIB_QSORT_R=0;       AC_SUBST([GNULIB_QSORT_R])
   GNULIB_RANDOM=0;        AC_SUBST([GNULIB_RANDOM])
   GNULIB_RANDOM_R=0;      AC_SUBST([GNULIB_RANDOM_R])
   GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
@@ -107,6 +108,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   REPLACE_PTSNAME=0;         AC_SUBST([REPLACE_PTSNAME])
   REPLACE_PTSNAME_R=0;       AC_SUBST([REPLACE_PTSNAME_R])
   REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
+  REPLACE_QSORT_R=0;         AC_SUBST([REPLACE_QSORT_R])
   REPLACE_RANDOM_R=0;        AC_SUBST([REPLACE_RANDOM_R])
   REPLACE_REALLOC=0;         AC_SUBST([REPLACE_REALLOC])
   REPLACE_REALPATH=0;        AC_SUBST([REPLACE_REALPATH])
diff --git a/lib/gl/m4/string_h.m4 b/lib/gl/m4/string_h.m4
index 64e683f..55d09ef 100644
--- a/lib/gl/m4/string_h.m4
+++ b/lib/gl/m4/string_h.m4
@@ -1,6 +1,6 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2014 Free Software Foundation, Inc.
+# Copyright (C) 2007-2015 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/strverscmp.m4 b/lib/gl/m4/strverscmp.m4
index aca1d54..c6c17d1 100644
--- a/lib/gl/m4/strverscmp.m4
+++ b/lib/gl/m4/strverscmp.m4
@@ -1,5 +1,5 @@
 # strverscmp.m4 serial 8
-dnl Copyright (C) 2002, 2005-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/sys_types_h.m4 b/lib/gl/m4/sys_types_h.m4
index 9748905..2232aec 100644
--- a/lib/gl/m4/sys_types_h.m4
+++ b/lib/gl/m4/sys_types_h.m4
@@ -1,5 +1,5 @@
 # sys_types_h.m4 serial 5
-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/thread.m4 b/lib/gl/m4/thread.m4
index b6d602a..5945126 100644
--- a/lib/gl/m4/thread.m4
+++ b/lib/gl/m4/thread.m4
@@ -1,5 +1,5 @@
 # thread.m4 serial 3
-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/threadlib.m4 b/lib/gl/m4/threadlib.m4
index a881702..8615ac9 100644
--- a/lib/gl/m4/threadlib.m4
+++ b/lib/gl/m4/threadlib.m4
@@ -1,5 +1,5 @@
-# threadlib.m4 serial 10 (gettext-0.18.2)
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
+# threadlib.m4 serial 11 (gettext-0.18.2)
+dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -22,7 +22,7 @@ dnl libtool).
 dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
 dnl programs that really need multithread functionality. The difference
 dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
-dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
+dnl symbols, typically LIBTHREAD is empty whereas LIBMULTITHREAD is not.
 dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
 dnl multithread-safe programs.
 
@@ -162,15 +162,31 @@ int main ()
         # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
         # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
         # the second one only in libpthread, and lock.c needs it.
-        AC_LINK_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[#include <pthread.h>]],
-             [[pthread_mutex_lock((pthread_mutex_t*)0);
-               pthread_mutexattr_init((pthread_mutexattr_t*)0);]])],
-          [gl_have_pthread=yes])
+        #
+        # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
+        # needs -pthread for some reason.  See:
+        # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
+        save_LIBS=$LIBS
+        for gl_pthread in '' '-pthread'; do
+          LIBS="$LIBS $gl_pthread"
+          AC_LINK_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[#include <pthread.h>
+                 pthread_mutex_t m;
+                 pthread_mutexattr_t ma;
+               ]],
+               [[pthread_mutex_lock (&m);
+                 pthread_mutexattr_init (&ma);]])],
+            [gl_have_pthread=yes
+             LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
+             LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread])
+          LIBS=$save_LIBS
+          test -n "$gl_have_pthread" && break
+        done
+
         # Test for libpthread by looking for pthread_kill. (Not pthread_self,
         # since it is defined as a macro on OSF/1.)
-        if test -n "$gl_have_pthread"; then
+        if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
           # The program links fine without libpthread. But it may actually
           # need to link with libpthread in order to create multiple threads.
           AC_CHECK_LIB([pthread], [pthread_kill],
@@ -185,7 +201,7 @@ int main ()
                    [Define if the pthread_in_use() detection is hard.])
              esac
             ])
-        else
+        elif test -z "$gl_have_pthread"; then
           # Some library is needed. Try libpthread and libc_r.
           AC_CHECK_LIB([pthread], [pthread_kill],
             [gl_have_pthread=yes
@@ -326,6 +342,8 @@ dnl Linux 2.4/glibc    posix      -lpthread       Y      OK
 dnl
 dnl GNU Hurd/glibc     posix
 dnl
+dnl Ubuntu 14.04       posix      -pthread        Y      OK
+dnl
 dnl FreeBSD 5.3        posix      -lc_r           Y
 dnl                    posix      -lkse ?         Y
 dnl                    posix      -lpthread ?     Y
diff --git a/lib/gl/m4/unistd_h.m4 b/lib/gl/m4/unistd_h.m4
index 1fa197e..b3c581f 100644
--- a/lib/gl/m4/unistd_h.m4
+++ b/lib/gl/m4/unistd_h.m4
@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 67
-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# unistd_h.m4 serial 68
+dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -173,9 +173,11 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   REPLACE_PWRITE=0;       AC_SUBST([REPLACE_PWRITE])
   REPLACE_READ=0;         AC_SUBST([REPLACE_READ])
   REPLACE_READLINK=0;     AC_SUBST([REPLACE_READLINK])
+  REPLACE_READLINKAT=0;   AC_SUBST([REPLACE_READLINKAT])
   REPLACE_RMDIR=0;        AC_SUBST([REPLACE_RMDIR])
   REPLACE_SLEEP=0;        AC_SUBST([REPLACE_SLEEP])
   REPLACE_SYMLINK=0;      AC_SUBST([REPLACE_SYMLINK])
+  REPLACE_SYMLINKAT=0;    AC_SUBST([REPLACE_SYMLINKAT])
   REPLACE_TTYNAME_R=0;    AC_SUBST([REPLACE_TTYNAME_R])
   REPLACE_UNLINK=0;       AC_SUBST([REPLACE_UNLINK])
   REPLACE_UNLINKAT=0;     AC_SUBST([REPLACE_UNLINKAT])
diff --git a/lib/gl/m4/visibility.m4 b/lib/gl/m4/visibility.m4
index 552e397..6fff745 100644
--- a/lib/gl/m4/visibility.m4
+++ b/lib/gl/m4/visibility.m4
@@ -1,5 +1,5 @@
 # visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008, 2010-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/warn-on-use.m4 b/lib/gl/m4/warn-on-use.m4
index cc690f8..1e98dc9 100644
--- a/lib/gl/m4/warn-on-use.m4
+++ b/lib/gl/m4/warn-on-use.m4
@@ -1,5 +1,5 @@
 # warn-on-use.m4 serial 5
-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/wchar_h.m4 b/lib/gl/m4/wchar_h.m4
index 85db952..9d1b0f8 100644
--- a/lib/gl/m4/wchar_h.m4
+++ b/lib/gl/m4/wchar_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/wchar_t.m4 b/lib/gl/m4/wchar_t.m4
index 839a04c..dc964e6 100644
--- a/lib/gl/m4/wchar_t.m4
+++ b/lib/gl/m4/wchar_t.m4
@@ -1,5 +1,5 @@
 # wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/wint_t.m4 b/lib/gl/m4/wint_t.m4
index 9b07b07..ca3fd44 100644
--- a/lib/gl/m4/wint_t.m4
+++ b/lib/gl/m4/wint_t.m4
@@ -1,5 +1,5 @@
 # wint_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/m4/yield.m4 b/lib/gl/m4/yield.m4
index e9442a6..4f24582 100644
--- a/lib/gl/m4/yield.m4
+++ b/lib/gl/m4/yield.m4
@@ -1,5 +1,5 @@
 # yield.m4 serial 2
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lib/gl/stdbool.in.h b/lib/gl/stdbool.in.h
index 6206d59..2bd9ec0 100644
--- a/lib/gl/stdbool.in.h
+++ b/lib/gl/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2001.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gl/stddef.in.h b/lib/gl/stddef.in.h
index ec944fd..86777bd 100644
--- a/lib/gl/stddef.in.h
+++ b/lib/gl/stddef.in.h
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -39,7 +39,6 @@
 
 # if !(defined address@hidden@_STDDEF_H && defined _GL_STDDEF_WINT_T)
 #  ifdef __need_wint_t
-#   undef address@hidden@_STDDEF_H
 #   define _GL_STDDEF_WINT_T
 #  endif
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
@@ -54,33 +53,45 @@
 
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
 
-#  ifndef address@hidden@_STDDEF_H
-#   define address@hidden@_STDDEF_H
-
 /* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
-#if @REPLACE_NULL@
-# undef NULL
-# ifdef __cplusplus
+#  if (@REPLACE_NULL@ \
+       && (!defined address@hidden@_STDDEF_H || defined _GL_STDDEF_WINT_T))
+#   undef NULL
+#   ifdef __cplusplus
    /* ISO C++ says that the macro NULL must expand to an integer constant
       expression, hence '((void *) 0)' is not allowed in C++.  */
-#  if __GNUG__ >= 3
+#    if __GNUG__ >= 3
     /* GNU C++ has a __null macro that behaves like an integer ('int' or
        'long') but has the same size as a pointer.  Use that, to avoid
        warnings.  */
-#   define NULL __null
-#  else
-#   define NULL 0L
+#     define NULL __null
+#    else
+#     define NULL 0L
+#    endif
+#   else
+#    define NULL ((void *) 0)
+#   endif
 #  endif
-# else
-#  define NULL ((void *) 0)
-# endif
-#endif
+
+#  ifndef address@hidden@_STDDEF_H
+#   define address@hidden@_STDDEF_H
 
 /* Some platforms lack wchar_t.  */
 #if address@hidden@
 # define wchar_t int
 #endif
 
+/* Some platforms lack max_align_t.  */
+#if address@hidden@
+typedef union
+{
+  char *__p;
+  double __d;
+  long double __ld;
+  long int __i;
+} max_align_t;
+#endif
+
 #  endif /* address@hidden@_STDDEF_H */
 # endif /* address@hidden@_STDDEF_H */
 #endif /* __need_XXX */
diff --git a/lib/gl/stdint.in.h b/lib/gl/stdint.in.h
index 9357a04..a422819 100644
--- a/lib/gl/stdint.in.h
+++ b/lib/gl/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2015 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
diff --git a/lib/gl/striconv.c b/lib/gl/striconv.c
index 7b21dbe..8e7aabb 100644
--- a/lib/gl/striconv.c
+++ b/lib/gl/striconv.c
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2007, 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2010-2015 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/lib/gl/striconv.h b/lib/gl/striconv.h
index c6f3e88..2ea220f 100644
--- a/lib/gl/striconv.h
+++ b/lib/gl/striconv.h
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2015 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/lib/gl/string.in.h b/lib/gl/string.in.h
index 1d063ba..fefc421 100644
--- a/lib/gl/string.in.h
+++ b/lib/gl/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2015 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/lib/gl/strverscmp.c b/lib/gl/strverscmp.c
index 0abc1fe..9e4f00d 100644
--- a/lib/gl/strverscmp.c
+++ b/lib/gl/strverscmp.c
@@ -1,5 +1,5 @@
 /* Compare strings while treating digits characters numerically.
-   Copyright (C) 1997, 2000, 2002, 2004, 2006, 2009-2014 Free Software
+   Copyright (C) 1997, 2000, 2002, 2004, 2006, 2009-2015 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jean-FranÃ§ois Bignolles <address@hidden>, 1997.
diff --git a/lib/gl/sys_types.in.h b/lib/gl/sys_types.in.h
index 40c8d57..188b1d3 100644
--- a/lib/gl/sys_types.in.h
+++ b/lib/gl/sys_types.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/types.h.
 
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/lib/gl/unistr.in.h b/lib/gl/unistr.in.h
index 1280103..89e9a56 100644
--- a/lib/gl/unistr.in.h
+++ b/lib/gl/unistr.in.h
@@ -1,5 +1,5 @@
 /* Elementary Unicode string functions.
-   Copyright (C) 2001-2002, 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/gl/unistr/u8-mbtoucr.c b/lib/gl/unistr/u8-mbtoucr.c
index 58d336c..b815927 100644
--- a/lib/gl/unistr/u8-mbtoucr.c
+++ b/lib/gl/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-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/gl/unistr/u8-uctomb-aux.c b/lib/gl/unistr/u8-uctomb-aux.c
index 63a3932..c9a32a6 100644
--- a/lib/gl/unistr/u8-uctomb-aux.c
+++ b/lib/gl/unistr/u8-uctomb-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UCS-4 to UTF-8.
-   Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/gl/unistr/u8-uctomb.c b/lib/gl/unistr/u8-uctomb.c
index 737e70f..62c7189 100644
--- a/lib/gl/unistr/u8-uctomb.c
+++ b/lib/gl/unistr/u8-uctomb.c
@@ -1,5 +1,5 @@
 /* Store a character in UTF-8 string.
-   Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/gl/unitypes.in.h b/lib/gl/unitypes.in.h
index baac3c4..21c0c3e 100644
--- a/lib/gl/unitypes.in.h
+++ b/lib/gl/unitypes.in.h
@@ -1,5 +1,5 @@
 /* Elementary types and macros for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/lib/gltests/Makefile.am b/lib/gltests/Makefile.am
index 83e821f..4544746 100644
--- a/lib/gltests/Makefile.am
+++ b/lib/gltests/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 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
@@ -195,6 +195,47 @@ EXTRA_DIST += test-inttypes.c
 
 ## end   gnulib module inttypes-tests
 
+## begin gnulib module langinfo
+
+BUILT_SOURCES += langinfo.h
+
+# We need the following in order to create an empty placeholder for
+# <langinfo.h> when the system doesn't have one.
+langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) 
$(WARN_ON_USE_H)
+       $(AM_V_GEN)rm -f address@hidden $@ && \
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+         sed -e 's|@''GUARD_PREFIX''@|GL_LGL|g' \
+             -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+             -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
+             -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
+             -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
+             -e 
's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
+             -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
+             -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
+             -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
+             -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
+             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             < $(srcdir)/langinfo.in.h; \
+       } > address@hidden && \
+       mv address@hidden $@
+MOSTLYCLEANFILES += langinfo.h langinfo.h-t
+
+EXTRA_DIST += langinfo.in.h
+
+## end   gnulib module langinfo
+
+## begin gnulib module langinfo-tests
+
+TESTS += test-langinfo
+check_PROGRAMS += test-langinfo
+EXTRA_DIST += test-langinfo.c
+
+## end   gnulib module langinfo-tests
+
 ## begin gnulib module locale
 
 BUILT_SOURCES += locale.h
@@ -451,6 +492,37 @@ EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h
 
 ## end   gnulib module snippet/warn-on-use
 
+## begin gnulib module stdalign
+
+BUILT_SOURCES += $(STDALIGN_H)
+
+# We need the following in order to create <stdalign.h> when the system
+# doesn't have one that works.
+if GL_GENERATE_STDALIGN_H
+stdalign.h: stdalign.in.h $(top_builddir)/config.status
+       $(AM_V_GEN)rm -f address@hidden $@ && \
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+         cat $(srcdir)/stdalign.in.h; \
+       } > address@hidden && \
+       mv address@hidden $@
+else
+stdalign.h: $(top_builddir)/config.status
+       rm -f $@
+endif
+MOSTLYCLEANFILES += stdalign.h stdalign.h-t
+
+EXTRA_DIST += stdalign.in.h
+
+## end   gnulib module stdalign
+
+## begin gnulib module stdalign-tests
+
+TESTS += test-stdalign
+check_PROGRAMS += test-stdalign
+EXTRA_DIST += test-stdalign.c macros.h
+
+## end   gnulib module stdalign-tests
+
 ## begin gnulib module stdbool-tests
 
 TESTS += test-stdbool
@@ -508,6 +580,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status 
$(CXXDEFS_H) \
              -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
              -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
              -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
+             -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \
              -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
              -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
              -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
@@ -559,6 +632,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status 
$(CXXDEFS_H) \
              -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
              -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
              -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+             -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
              -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
              -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
              -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
@@ -775,9 +849,11 @@ unistd.h: unistd.in.h $(top_builddir)/config.status 
$(CXXDEFS_H) $(ARG_NONNULL_H
              -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
              -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
              -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
+             -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
              -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
              -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
              -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
+             -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
              -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \
              -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \
              -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \
diff --git a/lib/gltests/alloca.in.h b/lib/gltests/alloca.in.h
index 5de9aaa..906fe92 100644
--- a/lib/gltests/alloca.in.h
+++ b/lib/gltests/alloca.in.h
@@ -1,6 +1,6 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2014 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2015 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify it
diff --git a/lib/gltests/glthread/lock.c b/lib/gltests/glthread/lock.c
index 33c15a0..b64132a 100644
--- a/lib/gltests/glthread/lock.c
+++ b/lib/gltests/glthread/lock.c
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2015 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/lib/gltests/glthread/lock.h b/lib/gltests/glthread/lock.h
index 36096c4..cf3d0d9 100644
--- a/lib/gltests/glthread/lock.h
+++ b/lib/gltests/glthread/lock.h
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2015 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/lib/gltests/glthread/thread.c b/lib/gltests/glthread/thread.c
index cec0b7c..d3829ce 100644
--- a/lib/gltests/glthread/thread.c
+++ b/lib/gltests/glthread/thread.c
@@ -1,5 +1,5 @@
 /* Creating and controlling threads.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2015 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/lib/gltests/glthread/thread.h b/lib/gltests/glthread/thread.h
index 509db6b..2817437 100644
--- a/lib/gltests/glthread/thread.h
+++ b/lib/gltests/glthread/thread.h
@@ -1,5 +1,5 @@
 /* Creating and controlling threads.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2015 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/lib/gltests/glthread/threadlib.c b/lib/gltests/glthread/threadlib.c
index 26870de..f01d351 100644
--- a/lib/gltests/glthread/threadlib.c
+++ b/lib/gltests/glthread/threadlib.c
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2015 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/lib/gltests/glthread/yield.h b/lib/gltests/glthread/yield.h
index b929224..b18db5b 100644
--- a/lib/gltests/glthread/yield.h
+++ b/lib/gltests/glthread/yield.h
@@ -1,5 +1,5 @@
 /* Yielding the processor to other threads and processes.
-   Copyright (C) 2005-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2015 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/lib/gltests/init.sh b/lib/gltests/init.sh
index fbd293d..9f403c5 100644
--- a/lib/gltests/init.sh
+++ b/lib/gltests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2015 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
@@ -93,6 +93,27 @@ skip_ () { warn_ "$ME_: skipped test: $@"; Exit 77; }
 fatal_ () { warn_ "$ME_: hard error: $@"; Exit 99; }
 framework_failure_ () { warn_ "$ME_: set-up failure: $@"; Exit 99; }
 
+# This is used to simplify checking of the return value
+# which is useful when ensuring a command fails as desired.
+# I.e., just doing `command ... &&fail=1` will not catch
+# a segfault in command for example.  With this helper you
+# instead check an explicit exit code like
+#   returns_ 1 command ... || fail
+returns_ () {
+  # Disable tracing so it doesn't interfere with stderr of the wrapped command
+  { set +x; } 2>/dev/null
+
+  local exp_exit="$1"
+  shift
+  "$@"
+  test $? -eq $exp_exit && ret_=0 || ret_=1
+
+  if test "$VERBOSE" = yes && test "$gl_set_x_corrupts_stderr_" = false; then
+    set -x
+  fi
+  { return $ret_; } 2>/dev/null
+}
+
 # Sanitize this shell to POSIX mode, if possible.
 DUALCASE=1; export DUALCASE
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
diff --git a/lib/gltests/intprops.h b/lib/gltests/intprops.h
index d0bb7a6..f85ccad 100644
--- a/lib/gltests/intprops.h
+++ b/lib/gltests/intprops.h
@@ -1,6 +1,6 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2005, 2009-2015 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/lib/gltests/inttypes.in.h b/lib/gltests/inttypes.in.h
index 4b2a13b..13a72be 100644
--- a/lib/gltests/inttypes.in.h
+++ b/lib/gltests/inttypes.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2015 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
 
diff --git a/lib/gltests/langinfo.in.h b/lib/gltests/langinfo.in.h
new file mode 100644
index 0000000..04fd535
--- /dev/null
+++ b/lib/gltests/langinfo.in.h
@@ -0,0 +1,194 @@
+/* Substitute for and wrapper around <langinfo.h>.
+   Copyright (C) 2009-2015 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, 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/>.  */
+
+/*
+ * POSIX <langinfo.h> for platforms that lack it or have an incomplete one.
+ * <http://www.opengroup.org/onlinepubs/9699919799/basedefs/langinfo.h.html>
+ */
+
+#ifndef address@hidden@_LANGINFO_H
+
+#if __GNUC__ >= 3
address@hidden@
+#endif
address@hidden@
+
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_LANGINFO_H@
+# @INCLUDE_NEXT@ @NEXT_LANGINFO_H@
+#endif
+
+#ifndef address@hidden@_LANGINFO_H
+#define address@hidden@_LANGINFO_H
+
+
+#if address@hidden@
+
+/* A platform that lacks <langinfo.h>.  */
+
+/* Assume that it also lacks <nl_types.h> and the nl_item type.  */
+# if !GNULIB_defined_nl_item
+typedef int nl_item;
+#  define GNULIB_defined_nl_item 1
+# endif
+
+/* nl_langinfo items of the LC_CTYPE category */
+# define CODESET     10000
+/* nl_langinfo items of the LC_NUMERIC category */
+# define RADIXCHAR   10001
+# define DECIMAL_POINT RADIXCHAR
+# define THOUSEP     10002
+# define THOUSANDS_SEP THOUSEP
+# define GROUPING    10114
+/* nl_langinfo items of the LC_TIME category */
+# define D_T_FMT     10003
+# define D_FMT       10004
+# define T_FMT       10005
+# define T_FMT_AMPM  10006
+# define AM_STR      10007
+# define PM_STR      10008
+# define DAY_1       10009
+# define DAY_2       (DAY_1 + 1)
+# define DAY_3       (DAY_1 + 2)
+# define DAY_4       (DAY_1 + 3)
+# define DAY_5       (DAY_1 + 4)
+# define DAY_6       (DAY_1 + 5)
+# define DAY_7       (DAY_1 + 6)
+# define ABDAY_1     10016
+# define ABDAY_2     (ABDAY_1 + 1)
+# define ABDAY_3     (ABDAY_1 + 2)
+# define ABDAY_4     (ABDAY_1 + 3)
+# define ABDAY_5     (ABDAY_1 + 4)
+# define ABDAY_6     (ABDAY_1 + 5)
+# define ABDAY_7     (ABDAY_1 + 6)
+# define MON_1       10023
+# define MON_2       (MON_1 + 1)
+# define MON_3       (MON_1 + 2)
+# define MON_4       (MON_1 + 3)
+# define MON_5       (MON_1 + 4)
+# define MON_6       (MON_1 + 5)
+# define MON_7       (MON_1 + 6)
+# define MON_8       (MON_1 + 7)
+# define MON_9       (MON_1 + 8)
+# define MON_10      (MON_1 + 9)
+# define MON_11      (MON_1 + 10)
+# define MON_12      (MON_1 + 11)
+# define ABMON_1     10035
+# define ABMON_2     (ABMON_1 + 1)
+# define ABMON_3     (ABMON_1 + 2)
+# define ABMON_4     (ABMON_1 + 3)
+# define ABMON_5     (ABMON_1 + 4)
+# define ABMON_6     (ABMON_1 + 5)
+# define ABMON_7     (ABMON_1 + 6)
+# define ABMON_8     (ABMON_1 + 7)
+# define ABMON_9     (ABMON_1 + 8)
+# define ABMON_10    (ABMON_1 + 9)
+# define ABMON_11    (ABMON_1 + 10)
+# define ABMON_12    (ABMON_1 + 11)
+# define ERA         10047
+# define ERA_D_FMT   10048
+# define ERA_D_T_FMT 10049
+# define ERA_T_FMT   10050
+# define ALT_DIGITS  10051
+/* nl_langinfo items of the LC_MONETARY category */
+# define CRNCYSTR    10052
+# define CURRENCY_SYMBOL   CRNCYSTR
+# define INT_CURR_SYMBOL   10100
+# define MON_DECIMAL_POINT 10101
+# define MON_THOUSANDS_SEP 10102
+# define MON_GROUPING      10103
+# define POSITIVE_SIGN     10104
+# define NEGATIVE_SIGN     10105
+# define FRAC_DIGITS       10106
+# define INT_FRAC_DIGITS   10107
+# define P_CS_PRECEDES     10108
+# define N_CS_PRECEDES     10109
+# define P_SEP_BY_SPACE    10110
+# define N_SEP_BY_SPACE    10111
+# define P_SIGN_POSN       10112
+# define N_SIGN_POSN       10113
+/* nl_langinfo items of the LC_MESSAGES category */
+# define YESEXPR     10053
+# define NOEXPR      10054
+
+#else
+
+/* A platform that has <langinfo.h>.  */
+
+# if address@hidden@
+#  define CODESET     10000
+#  define GNULIB_defined_CODESET 1
+# endif
+
+# if address@hidden@
+#  define T_FMT_AMPM  10006
+#  define GNULIB_defined_T_FMT_AMPM 1
+# endif
+
+# if address@hidden@
+#  define ERA         10047
+#  define ERA_D_FMT   10048
+#  define ERA_D_T_FMT 10049
+#  define ERA_T_FMT   10050
+#  define ALT_DIGITS  10051
+#  define GNULIB_defined_ERA 1
+# endif
+
+# if address@hidden@
+#  define YESEXPR     10053
+#  define NOEXPR      10054
+#  define GNULIB_defined_YESEXPR 1
+# endif
+
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+/* Declare overridden functions.  */
+
+
+/* Return a piece of locale dependent information.
+   Note: The difference between nl_langinfo (CODESET) and locale_charset ()
+   is that the latter normalizes the encoding names to GNU conventions.  */
+
+#if @GNULIB_NL_LANGINFO@
+# if @REPLACE_NL_LANGINFO@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef nl_langinfo
+#   define nl_langinfo rpl_nl_langinfo
+#  endif
+_GL_FUNCDECL_RPL (nl_langinfo, char *, (nl_item item));
+_GL_CXXALIAS_RPL (nl_langinfo, char *, (nl_item item));
+# else
+#  if address@hidden@
+_GL_FUNCDECL_SYS (nl_langinfo, char *, (nl_item item));
+#  endif
+_GL_CXXALIAS_SYS (nl_langinfo, char *, (nl_item item));
+# endif
+_GL_CXXALIASWARN (nl_langinfo);
+#elif defined GNULIB_POSIXCHECK
+# undef nl_langinfo
+# if HAVE_RAW_DECL_NL_LANGINFO
+_GL_WARN_ON_USE (nl_langinfo, "nl_langinfo is not portable - "
+                 "use gnulib module nl_langinfo for portability");
+# endif
+#endif
+
+
+#endif /* address@hidden@_LANGINFO_H */
+#endif /* address@hidden@_LANGINFO_H */
diff --git a/lib/gltests/locale.in.h b/lib/gltests/locale.in.h
index 10cc44b..05e974d 100644
--- a/lib/gltests/locale.in.h
+++ b/lib/gltests/locale.in.h
@@ -1,5 +1,5 @@
 /* A POSIX <locale.h>.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/lib/gltests/localename.c b/lib/gltests/localename.c
index 2c7bfc8..35b6de4 100644
--- a/lib/gltests/localename.c
+++ b/lib/gltests/localename.c
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 1995-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995-2015 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
@@ -42,6 +42,10 @@
 # if !defined IN_LIBINTL
 #  include "glthread/lock.h"
 # endif
+# if defined __sun
+/* Solaris >= 12.  */
+extern char * getlocalename_l(int, locale_t);
+# endif
 #endif
 
 #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
@@ -2584,7 +2588,7 @@ get_lcid (const char *locale_name)
 #endif
 
 
-#if HAVE_USELOCALE /* glibc or Mac OS X */
+#if HAVE_USELOCALE /* glibc, Solaris >= 12 or Mac OS X */
 
 /* Simple hash set of strings.  We don't want to drag in lots of hash table
    code here.  */
@@ -2723,6 +2727,11 @@ gl_locale_name_thread_unsafe (int category, const char 
*categoryname)
             return "";
           }
         return querylocale (mask, thread_locale);
+#  elif defined __sun
+        /* Solaris >= 12.  */
+        return getlocalename_l (category, thread_locale);
+#  elif defined __ANDROID__
+        return MB_CUR_MAX == 4 ? "C.UTF-8" : "C";
 #  endif
       }
   }
diff --git a/lib/gltests/localename.h b/lib/gltests/localename.h
index 861e6e9..13c126d 100644
--- a/lib/gltests/localename.h
+++ b/lib/gltests/localename.h
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2015 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/lib/gltests/macros.h b/lib/gltests/macros.h
index 0d7e378..b6fdd1c 100644
--- a/lib/gltests/macros.h
+++ b/lib/gltests/macros.h
@@ -1,5 +1,5 @@
 /* Common macros used by gnulib tests.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2015 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/lib/gltests/malloc.c b/lib/gltests/malloc.c
index bc81c54..00800a2 100644
--- a/lib/gltests/malloc.c
+++ b/lib/gltests/malloc.c
@@ -1,6 +1,6 @@
 /* malloc() function that is glibc compatible.
 
-   Copyright (C) 1997-1998, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2015 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/lib/gltests/malloca.c b/lib/gltests/malloca.c
index 370551c..198a96c 100644
--- a/lib/gltests/malloca.c
+++ b/lib/gltests/malloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gltests/malloca.h b/lib/gltests/malloca.h
index 5071e46..7a4190c 100644
--- a/lib/gltests/malloca.h
+++ b/lib/gltests/malloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gltests/putenv.c b/lib/gltests/putenv.c
index b9f5079..925bb2f 100644
--- a/lib/gltests/putenv.c
+++ b/lib/gltests/putenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2014 Free Software
+/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2015 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
diff --git a/lib/gltests/setenv.c b/lib/gltests/setenv.c
index 06791a9..6b16fd5 100644
--- a/lib/gltests/setenv.c
+++ b/lib/gltests/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2015 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/lib/gltests/setlocale.c b/lib/gltests/setlocale.c
index 3009d2c..a7a1233 100644
--- a/lib/gltests/setlocale.c
+++ b/lib/gltests/setlocale.c
@@ -1,5 +1,5 @@
 /* Set the current locale.
-   Copyright (C) 2009, 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011-2015 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/lib/gltests/signature.h b/lib/gltests/signature.h
index 0ae64e7..0a6cf91 100644
--- a/lib/gltests/signature.h
+++ b/lib/gltests/signature.h
@@ -1,5 +1,5 @@
 /* Macro for checking that a function declaration is compliant.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/lib/gltests/stdalign.in.h b/lib/gltests/stdalign.in.h
new file mode 100644
index 0000000..a990050
--- /dev/null
+++ b/lib/gltests/stdalign.in.h
@@ -0,0 +1,113 @@
+/* A substitute for ISO C11 <stdalign.h>.
+
+   Copyright 2011-2015 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, 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/>.  */
+
+/* Written by Paul Eggert and Bruno Haible.  */
+
+#ifndef _GL_STDALIGN_H
+#define _GL_STDALIGN_H
+
+/* ISO C11 <stdalign.h> for platforms that lack it.
+
+   References:
+   ISO C11 (latest free draft
+   <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1570.pdf>)
+   sections 6.5.3.4, 6.7.5, 7.15.
+   C++11 (latest free draft
+   <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf>)
+   section 18.10. */
+
+/* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment
+   requirement of a structure member (i.e., slot or field) that is of
+   type TYPE, as an integer constant expression.
+
+   This differs from GCC's __alignof__ operator, which can yield a
+   better-performing alignment for an object of that type.  For
+   example, on x86 with GCC, __alignof__ (double) and __alignof__
+   (long long) are 8, whereas alignof (double) and alignof (long long)
+   are 4 unless the option '-malign-double' is used.
+
+   The result cannot be used as a value for an 'enum' constant, if you
+   want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc.
+
+   Include <stddef.h> for offsetof.  */
+#include <stddef.h>
+
+/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
+   standard headers, defines conflicting implementations of _Alignas
+   and _Alignof that are no better than ours; override them.  */
+#undef _Alignas
+#undef _Alignof
+
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
+# ifdef __cplusplus
+#  if 201103 <= __cplusplus
+#   define _Alignof(type) alignof (type)
+#  else
+   template <class __t> struct __alignof_helper { char __a; __t __b; };
+#   define _Alignof(type) offsetof (__alignof_helper<type>, __b)
+#  endif
+# else
+#  define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
+# endif
+#endif
+#define alignof _Alignof
+#define __alignof_is_defined 1
+
+/* alignas (A), also known as _Alignas (A), aligns a variable or type
+   to the alignment A, where A is an integer constant expression.  For
+   example:
+
+      int alignas (8) foo;
+      struct s { int a; int alignas (8) bar; };
+
+   aligns the address of FOO and the offset of BAR to be multiples of 8.
+
+   A should be a power of two that is at least the type's alignment
+   and at most the implementation's alignment limit.  This limit is
+   2**28 on typical GNUish hosts, and 2**13 on MSVC.  To be portable
+   to MSVC through at least version 10.0, A should be an integer
+   constant, as MSVC does not support expressions such as 1 << 3.
+   To be portable to Sun C 5.11, do not align auto variables to
+   anything stricter than their default alignment.
+
+   The following C11 requirements are not supported here:
+
+     - If A is zero, alignas has no effect.
+     - alignas can be used multiple times; the strictest one wins.
+     - alignas (TYPE) is equivalent to alignas (alignof (TYPE)).
+
+   */
+
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
+# if defined __cplusplus && 201103 <= __cplusplus
+#  define _Alignas(a) alignas (a)
+# elif ((defined __APPLE__ && defined __MACH__                  \
+         ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__)                 \
+         : __GNUC__)                                            \
+        || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__        \
+        || __ICC || 0x5110 <= __SUNPRO_C)
+#  define _Alignas(a) __attribute__ ((__aligned__ (a)))
+# elif 1300 <= _MSC_VER
+#  define _Alignas(a) __declspec (align (a))
+# endif
+#endif
+#if defined _Alignas || (defined __STDC_VERSION && 201112 <= __STDC_VERSION__)
+# define alignas _Alignas
+# define __alignas_is_defined 1
+#endif
+
+#endif /* _GL_STDALIGN_H */
diff --git a/lib/gltests/stdlib.in.h b/lib/gltests/stdlib.in.h
index 46e10db..428a119 100644
--- a/lib/gltests/stdlib.in.h
+++ b/lib/gltests/stdlib.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2015 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
@@ -520,6 +520,29 @@ _GL_CXXALIAS_SYS (putenv, int, (char *string));
 _GL_CXXALIASWARN (putenv);
 #endif
 
+#if @GNULIB_QSORT_R@
+# if @REPLACE_QSORT_R@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef qsort_r
+#   define qsort_r rpl_qsort_r
+#  endif
+_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg) _GL_ARG_NONNULL ((1, 4)));
+_GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg));
+# else
+_GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg));
+# endif
+_GL_CXXALIASWARN (qsort_r);
+#endif
+
 
 #if @GNULIB_RANDOM_R@
 # if address@hidden@
diff --git a/lib/gltests/test-alloca-opt.c b/lib/gltests/test-alloca-opt.c
index 3d8acc4..c189cc6 100644
--- a/lib/gltests/test-alloca-opt.c
+++ b/lib/gltests/test-alloca-opt.c
@@ -1,5 +1,5 @@
 /* Test of optional automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2015 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/lib/gltests/test-c-ctype.c b/lib/gltests/test-c-ctype.c
index 80bf703..81fe936 100644
--- a/lib/gltests/test-c-ctype.c
+++ b/lib/gltests/test-c-ctype.c
@@ -1,5 +1,5 @@
 /* Test of character handling in C locale.
-   Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2015 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/lib/gltests/test-c-strcasecmp.c b/lib/gltests/test-c-strcasecmp.c
index 03088ff..f7f6b43 100644
--- a/lib/gltests/test-c-strcasecmp.c
+++ b/lib/gltests/test-c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/lib/gltests/test-c-strncasecmp.c b/lib/gltests/test-c-strncasecmp.c
index 0fba0e5..4027b5b 100644
--- a/lib/gltests/test-c-strncasecmp.c
+++ b/lib/gltests/test-c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/lib/gltests/test-environ.c b/lib/gltests/test-environ.c
index 46a2eab..e4616da 100644
--- a/lib/gltests/test-environ.c
+++ b/lib/gltests/test-environ.c
@@ -1,5 +1,5 @@
 /* Test of environ variable.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/lib/gltests/test-iconv.c b/lib/gltests/test-iconv.c
index 3c1b193..ed715bd 100644
--- a/lib/gltests/test-iconv.c
+++ b/lib/gltests/test-iconv.c
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/lib/gltests/test-init.sh b/lib/gltests/test-init.sh
index be447b3..0875a75 100755
--- a/lib/gltests/test-init.sh
+++ b/lib/gltests/test-init.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Unit tests for init.sh
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2015 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/lib/gltests/test-intprops.c b/lib/gltests/test-intprops.c
index 97553e7..06df5a7 100644
--- a/lib/gltests/test-intprops.c
+++ b/lib/gltests/test-intprops.c
@@ -1,5 +1,5 @@
 /* Test intprops.h.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/lib/gltests/test-inttypes.c b/lib/gltests/test-inttypes.c
index 35deeab..7fa18b2 100644
--- a/lib/gltests/test-inttypes.c
+++ b/lib/gltests/test-inttypes.c
@@ -1,5 +1,5 @@
 /* Test of <inttypes.h> substitute.
-   Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2015 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/lib/gltests/test-langinfo.c b/lib/gltests/test-langinfo.c
new file mode 100644
index 0000000..b038ca3
--- /dev/null
+++ b/lib/gltests/test-langinfo.c
@@ -0,0 +1,92 @@
+/* Test of <langinfo.h> substitute.
+   Copyright (C) 2009-2015 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/>.  */
+
+/* Written by Bruno Haible <address@hidden>, 2009.  */
+
+#include <config.h>
+
+#include <langinfo.h>
+
+/* Check that all the nl_item values are defined.  */
+int items[] =
+  {
+    /* nl_langinfo items of the LC_CTYPE category */
+    CODESET,
+    /* nl_langinfo items of the LC_NUMERIC category */
+    RADIXCHAR,
+    THOUSEP,
+    /* nl_langinfo items of the LC_TIME category */
+    D_T_FMT,
+    D_FMT,
+    T_FMT,
+    T_FMT_AMPM,
+    AM_STR,
+    PM_STR,
+    DAY_1,
+    DAY_2,
+    DAY_3,
+    DAY_4,
+    DAY_5,
+    DAY_6,
+    DAY_7,
+    ABDAY_1,
+    ABDAY_2,
+    ABDAY_3,
+    ABDAY_4,
+    ABDAY_5,
+    ABDAY_6,
+    ABDAY_7,
+    MON_1,
+    MON_2,
+    MON_3,
+    MON_4,
+    MON_5,
+    MON_6,
+    MON_7,
+    MON_8,
+    MON_9,
+    MON_10,
+    MON_11,
+    MON_12,
+    ABMON_1,
+    ABMON_2,
+    ABMON_3,
+    ABMON_4,
+    ABMON_5,
+    ABMON_6,
+    ABMON_7,
+    ABMON_8,
+    ABMON_9,
+    ABMON_10,
+    ABMON_11,
+    ABMON_12,
+    ERA,
+    ERA_D_FMT,
+    ERA_D_T_FMT,
+    ERA_T_FMT,
+    ALT_DIGITS,
+    /* nl_langinfo items of the LC_MONETARY category */
+    CRNCYSTR,
+    /* nl_langinfo items of the LC_MESSAGES category */
+    YESEXPR,
+    NOEXPR
+  };
+
+int
+main (void)
+{
+  return 0;
+}
diff --git a/lib/gltests/test-locale.c b/lib/gltests/test-locale.c
index cf4e6e8..5383cff 100644
--- a/lib/gltests/test-locale.c
+++ b/lib/gltests/test-locale.c
@@ -1,5 +1,5 @@
 /* Test of <locale.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2015 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
@@ -33,11 +33,6 @@ int a[] =
     LC_TIME
   };
 
-#if HAVE_NEWLOCALE
-/* Check that the locale_t type and the LC_GLOBAL_LOCALE macro are defined.  */
-locale_t b = LC_GLOBAL_LOCALE;
-#endif
-
 /* Check that the 'struct lconv' type is defined.  */
 struct lconv l;
 int ls;
@@ -49,6 +44,12 @@ verify (sizeof NULL == sizeof (void *));
 int
 main ()
 {
+#if HAVE_NEWLOCALE
+  /* Check that the locale_t type and the LC_GLOBAL_LOCALE macro are defined.  
*/
+  locale_t b = LC_GLOBAL_LOCALE;
+  (void) b;
+#endif
+
   /* Check that 'struct lconv' has the ISO C and POSIX specified members.  */
   ls += sizeof (*l.decimal_point);
   ls += sizeof (*l.thousands_sep);
diff --git a/lib/gltests/test-localename.c b/lib/gltests/test-localename.c
index df6c1d6..b5dd742 100644
--- a/lib/gltests/test-localename.c
+++ b/lib/gltests/test-localename.c
@@ -1,5 +1,5 @@
 /* Test of gl_locale_name function and its variants.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/lib/gltests/test-lock.c b/lib/gltests/test-lock.c
index fd2ed26..a992f64 100644
--- a/lib/gltests/test-lock.c
+++ b/lib/gltests/test-lock.c
@@ -1,5 +1,5 @@
 /* Test of locking in multithreaded situations.
-   Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008-2015 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/lib/gltests/test-malloca.c b/lib/gltests/test-malloca.c
index 6f94d0d..717ede0 100644
--- a/lib/gltests/test-malloca.c
+++ b/lib/gltests/test-malloca.c
@@ -1,5 +1,5 @@
 /* Test of safe automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2015 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/lib/gltests/test-setenv.c b/lib/gltests/test-setenv.c
index 548e4fb..a7ef488 100644
--- a/lib/gltests/test-setenv.c
+++ b/lib/gltests/test-setenv.c
@@ -1,5 +1,5 @@
 /* Tests of setenv.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/lib/gltests/test-setlocale1.c b/lib/gltests/test-setlocale1.c
index 0434d7b..6e0ef9d 100644
--- a/lib/gltests/test-setlocale1.c
+++ b/lib/gltests/test-setlocale1.c
@@ -1,5 +1,5 @@
 /* Test of setting the current locale.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/lib/gltests/test-setlocale2.c b/lib/gltests/test-setlocale2.c
index 2f52fe0..1bd8a5c 100644
--- a/lib/gltests/test-setlocale2.c
+++ b/lib/gltests/test-setlocale2.c
@@ -1,5 +1,5 @@
 /* Test of setting the current locale.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/lib/gltests/test-stdalign.c b/lib/gltests/test-stdalign.c
new file mode 100644
index 0000000..68b9ef1
--- /dev/null
+++ b/lib/gltests/test-stdalign.c
@@ -0,0 +1,116 @@
+/* Test of <stdalign.h>.
+   Copyright 2009-2015 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/>.  */
+
+/* Written by Paul Eggert, inspired by Bruno Haible's test-alignof.c.  */
+
+#include <config.h>
+
+#include <stdalign.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "verify.h"
+
+#include "macros.h"
+
+typedef long double longdouble;
+typedef struct { char a[1]; } struct1;
+typedef struct { char a[2]; } struct2;
+typedef struct { char a[3]; } struct3;
+typedef struct { char a[4]; } struct4;
+
+verify (__alignof_is_defined == 1);
+#ifndef alignof
+# error "alignof is not a macro"
+#endif
+
+#if __alignas_is_defined
+verify (__alignas_is_defined == 1);
+# ifndef alignas
+#  error "alignas is not a macro"
+# endif
+/* mingw can go up only to 8.  8 is all that GNU Emacs needs, so let's
+   limit the test to 8 for now.  */
+# define TEST_ALIGNMENT 8
+#else
+# define _Alignas(alignment)
+# define alignas(alignment)
+# define TEST_ALIGNMENT 1
+#endif
+
+#define CHECK_STATIC(type) \
+  typedef struct { char slot1; type slot2; } type##_helper; \
+  verify (alignof (type) == offsetof (type##_helper, slot2)); \
+  verify (_Alignof (type) == alignof (type)); \
+  const int type##_alignment = alignof (type); \
+  type alignas (TEST_ALIGNMENT) static_##type##_alignas; \
+  type _Alignas (TEST_ALIGNMENT) static_##type##_Alignas
+
+#define CHECK_ALIGNED(var) ASSERT ((uintptr_t) &(var) % TEST_ALIGNMENT == 0)
+
+CHECK_STATIC (char);
+CHECK_STATIC (short);
+CHECK_STATIC (int);
+CHECK_STATIC (long);
+#ifdef INT64_MAX
+CHECK_STATIC (int64_t);
+#endif
+CHECK_STATIC (float);
+CHECK_STATIC (double);
+/* CHECK_STATIC (longdouble); */
+CHECK_STATIC (struct1);
+CHECK_STATIC (struct2);
+CHECK_STATIC (struct3);
+CHECK_STATIC (struct4);
+
+int
+main ()
+{
+#if defined __SUNPRO_C
+  /* Avoid a test failure due to Sun Studio Developer Bug Report #2125432.  */
+  fputs ("Skipping test: known Sun C compiler bug\n", stderr);
+  return 77;
+#else
+  CHECK_ALIGNED (static_char_alignas);
+  CHECK_ALIGNED (static_char_Alignas);
+  CHECK_ALIGNED (static_short_alignas);
+  CHECK_ALIGNED (static_short_Alignas);
+  CHECK_ALIGNED (static_int_alignas);
+  CHECK_ALIGNED (static_int_Alignas);
+  CHECK_ALIGNED (static_long_alignas);
+  CHECK_ALIGNED (static_long_Alignas);
+# ifdef INT64_MAX
+  CHECK_ALIGNED (static_int64_t_alignas);
+  CHECK_ALIGNED (static_int64_t_Alignas);
+# endif
+  CHECK_ALIGNED (static_float_alignas);
+  CHECK_ALIGNED (static_float_Alignas);
+  CHECK_ALIGNED (static_double_alignas);
+  CHECK_ALIGNED (static_double_Alignas);
+  /* CHECK_ALIGNED (static_longdouble_alignas); */
+  /* CHECK_ALIGNED (static_longdouble_Alignas); */
+  CHECK_ALIGNED (static_struct1_alignas);
+  CHECK_ALIGNED (static_struct1_Alignas);
+  CHECK_ALIGNED (static_struct2_alignas);
+  CHECK_ALIGNED (static_struct2_Alignas);
+  CHECK_ALIGNED (static_struct3_alignas);
+  CHECK_ALIGNED (static_struct3_Alignas);
+  CHECK_ALIGNED (static_struct4_alignas);
+  CHECK_ALIGNED (static_struct4_Alignas);
+  return 0;
+#endif
+}
diff --git a/lib/gltests/test-stdbool.c b/lib/gltests/test-stdbool.c
index efa8324..1da25d0 100644
--- a/lib/gltests/test-stdbool.c
+++ b/lib/gltests/test-stdbool.c
@@ -1,5 +1,5 @@
 /* Test of <stdbool.h> substitute.
-   Copyright (C) 2002-2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2007, 2009-2015 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/lib/gltests/test-stddef.c b/lib/gltests/test-stddef.c
index d5d887e..3179496 100644
--- a/lib/gltests/test-stddef.c
+++ b/lib/gltests/test-stddef.c
@@ -1,5 +1,5 @@
 /* Test of <stddef.h> substitute.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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
@@ -19,13 +19,14 @@
 #include <config.h>
 
 #include <stddef.h>
-
+#include <stdalign.h>
 #include "verify.h"
 
 /* Check that appropriate types are defined.  */
 wchar_t a = 'c';
 ptrdiff_t b = 1;
 size_t c = 2;
+max_align_t x;
 
 /* Check that NULL can be passed through varargs as a pointer type,
    per POSIX 2008.  */
@@ -45,6 +46,16 @@ verify (sizeof (offsetof (struct d, e)) == sizeof (size_t));
 verify (offsetof (struct d, e) < -1); /* Must be unsigned.  */
 verify (offsetof (struct d, f) == 1);
 
+/* Check max_align_t's alignment.  */
+verify (alignof (double) <= alignof (max_align_t));
+verify (alignof (int) <= alignof (max_align_t));
+verify (alignof (long double) <= alignof (max_align_t));
+verify (alignof (long int) <= alignof (max_align_t));
+verify (alignof (ptrdiff_t) <= alignof (max_align_t));
+verify (alignof (size_t) <= alignof (max_align_t));
+verify (alignof (wchar_t) <= alignof (max_align_t));
+verify (alignof (struct d) <= alignof (max_align_t));
+
 int
 main (void)
 {
diff --git a/lib/gltests/test-stdint.c b/lib/gltests/test-stdint.c
index 008b517..8d54db2 100644
--- a/lib/gltests/test-stdint.c
+++ b/lib/gltests/test-stdint.c
@@ -1,5 +1,5 @@
 /* Test of <stdint.h> substitute.
-   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+   Copyright (C) 2006-2015 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/lib/gltests/test-stdlib.c b/lib/gltests/test-stdlib.c
index a2743e4..b2da7ec 100644
--- a/lib/gltests/test-stdlib.c
+++ b/lib/gltests/test-stdlib.c
@@ -1,5 +1,5 @@
 /* Test of <stdlib.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2015 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/lib/gltests/test-striconv.c b/lib/gltests/test-striconv.c
index fd29a09..fc9b200 100644
--- a/lib/gltests/test-striconv.c
+++ b/lib/gltests/test-striconv.c
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/lib/gltests/test-strverscmp.c b/lib/gltests/test-strverscmp.c
index 07b686d..771977e 100644
--- a/lib/gltests/test-strverscmp.c
+++ b/lib/gltests/test-strverscmp.c
@@ -1,5 +1,5 @@
 /* Test of strverscmp() function.
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 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/lib/gltests/test-sys_types.c b/lib/gltests/test-sys_types.c
index ddcb6d2..1ef3b90 100644
--- a/lib/gltests/test-sys_types.c
+++ b/lib/gltests/test-sys_types.c
@@ -1,5 +1,5 @@
 /* Test of <sys/types.h> substitute.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/lib/gltests/test-sys_wait.h b/lib/gltests/test-sys_wait.h
index ed20219..e4a79b5 100644
--- a/lib/gltests/test-sys_wait.h
+++ b/lib/gltests/test-sys_wait.h
@@ -1,5 +1,5 @@
 /* Test of macros shared between <sys/wait.h> and <stdlib.h>.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010-2015 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/lib/gltests/test-thread_create.c b/lib/gltests/test-thread_create.c
index 12ba79d..c6dbc7b 100644
--- a/lib/gltests/test-thread_create.c
+++ b/lib/gltests/test-thread_create.c
@@ -1,5 +1,5 @@
 /* Test of gl_thread_create () macro.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/lib/gltests/test-thread_self.c b/lib/gltests/test-thread_self.c
index 3629a82..1d2d05e 100644
--- a/lib/gltests/test-thread_self.c
+++ b/lib/gltests/test-thread_self.c
@@ -1,5 +1,5 @@
 /* Test of gl_thread_self () macro.
-   Copyright (C) 2011-2014 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 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/lib/gltests/test-unistd.c b/lib/gltests/test-unistd.c
index 6d3fa00..930b5e2 100644
--- a/lib/gltests/test-unistd.c
+++ b/lib/gltests/test-unistd.c
@@ -1,5 +1,5 @@
 /* Test of <unistd.h> substitute.
-   Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2015 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/lib/gltests/test-unsetenv.c b/lib/gltests/test-unsetenv.c
index 50600a9..235e185 100644
--- a/lib/gltests/test-unsetenv.c
+++ b/lib/gltests/test-unsetenv.c
@@ -1,5 +1,5 @@
 /* Tests of unsetenv.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 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/lib/gltests/test-verify.c b/lib/gltests/test-verify.c
index 2a41eb1..640dc42 100644
--- a/lib/gltests/test-verify.c
+++ b/lib/gltests/test-verify.c
@@ -1,6 +1,6 @@
 /* Test the "verify" module.
 
-   Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2015 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/lib/gltests/unistd.in.h b/lib/gltests/unistd.in.h
index 622b228..958fea2 100644
--- a/lib/gltests/unistd.in.h
+++ b/lib/gltests/unistd.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2015 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
@@ -401,6 +401,12 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - "
 /* Set of environment variables and values.  An array of strings of the form
    "VARIABLE=VALUE", terminated with a NULL.  */
 #  if defined __APPLE__ && defined __MACH__
+#   include <TargetConditionals.h>
+#   if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
+#    define _GL_USE_CRT_EXTERNS
+#   endif
+#  endif
+#  ifdef _GL_USE_CRT_EXTERNS
 #   include <crt_externs.h>
 #   define environ (*_NSGetEnviron ())
 #  else
@@ -1287,13 +1293,24 @@ _GL_WARN_ON_USE (readlink, "readlink is unportable - "
 
 
 #if @GNULIB_READLINKAT@
-# if address@hidden@
+# if @REPLACE_READLINKAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define readlinkat rpl_readlinkat
+#  endif
+_GL_FUNCDECL_RPL (readlinkat, ssize_t,
+                  (int fd, char const *file, char *buf, size_t len)
+                  _GL_ARG_NONNULL ((2, 3)));
+_GL_CXXALIAS_RPL (readlinkat, ssize_t,
+                  (int fd, char const *file, char *buf, size_t len));
+# else
+#  if address@hidden@
 _GL_FUNCDECL_SYS (readlinkat, ssize_t,
                   (int fd, char const *file, char *buf, size_t len)
                   _GL_ARG_NONNULL ((2, 3)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (readlinkat, ssize_t,
                   (int fd, char const *file, char *buf, size_t len));
+# endif
 _GL_CXXALIASWARN (readlinkat);
 #elif defined GNULIB_POSIXCHECK
 # undef readlinkat
@@ -1407,13 +1424,25 @@ _GL_WARN_ON_USE (symlink, "symlink is not portable - "
 
 
 #if @GNULIB_SYMLINKAT@
-# if address@hidden@
+# if @REPLACE_SYMLINKAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef symlinkat
+#   define symlinkat rpl_symlinkat
+#  endif
+_GL_FUNCDECL_RPL (symlinkat, int,
+                  (char const *contents, int fd, char const *file)
+                  _GL_ARG_NONNULL ((1, 3)));
+_GL_CXXALIAS_RPL (symlinkat, int,
+                  (char const *contents, int fd, char const *file));
+# else
+#  if address@hidden@
 _GL_FUNCDECL_SYS (symlinkat, int,
                   (char const *contents, int fd, char const *file)
                   _GL_ARG_NONNULL ((1, 3)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (symlinkat, int,
                   (char const *contents, int fd, char const *file));
+# endif
 _GL_CXXALIASWARN (symlinkat);
 #elif defined GNULIB_POSIXCHECK
 # undef symlinkat
diff --git a/lib/gltests/unistr/test-u8-mbtoucr.c 
b/lib/gltests/unistr/test-u8-mbtoucr.c
index a551130..7f02e8b 100644
--- a/lib/gltests/unistr/test-u8-mbtoucr.c
+++ b/lib/gltests/unistr/test-u8-mbtoucr.c
@@ -1,5 +1,5 @@
 /* Test of u8_mbtoucr() function.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010-2015 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/lib/gltests/unistr/test-u8-uctomb.c 
b/lib/gltests/unistr/test-u8-uctomb.c
index cec9216..f586f04 100644
--- a/lib/gltests/unistr/test-u8-uctomb.c
+++ b/lib/gltests/unistr/test-u8-uctomb.c
@@ -1,5 +1,5 @@
 /* Test of u8_uctomb() function.
-   Copyright (C) 2010-2014 Free Software Foundation, Inc.
+   Copyright (C) 2010-2015 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/lib/gltests/unsetenv.c b/lib/gltests/unsetenv.c
index 53721fc..87f41d5 100644
--- a/lib/gltests/unsetenv.c
+++ b/lib/gltests/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2002, 2005-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2002, 2005-2015 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/lib/gltests/verify.h b/lib/gltests/verify.h
index a25e514..60eba49 100644
--- a/lib/gltests/verify.h
+++ b/lib/gltests/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2015 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/lib/gltests/wchar.in.h b/lib/gltests/wchar.in.h
index 473285f..fc06d27 100644
--- a/lib/gltests/wchar.in.h
+++ b/lib/gltests/wchar.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
+   Copyright (C) 2007-2015 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/lib/idn-free.c b/lib/idn-free.c
index c3390f2..75b81e2 100644
--- a/lib/idn-free.c
+++ b/lib/idn-free.c
@@ -1,5 +1,5 @@
 /* idn-free.h --- Invoke the free function to release memory
-   Copyright (C) 2004-2014 Simon Josefsson
+   Copyright (C) 2004-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/idn-free.h b/lib/idn-free.h
index ef44c7a..1444d37 100644
--- a/lib/idn-free.h
+++ b/lib/idn-free.h
@@ -1,5 +1,5 @@
 /* idn-free.h --- Invoke the free function to release memory
-   Copyright (C) 2004-2014 Simon Josefsson
+   Copyright (C) 2004-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/idna.c b/lib/idna.c
index 6d63ab6..bf93bfe 100644
--- a/lib/idna.c
+++ b/lib/idna.c
@@ -1,5 +1,5 @@
 /* idna.c --- Prototypes for Internationalized Domain Name library.
-   Copyright (C) 2002-2014 Simon Josefsson
+   Copyright (C) 2002-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/idna.h b/lib/idna.h
index a6f9aab..f214075 100644
--- a/lib/idna.h
+++ b/lib/idna.h
@@ -1,5 +1,5 @@
 /* idna.h --- Prototypes for Internationalized Domain Name library.
-   Copyright (C) 2002-2014 Simon Josefsson
+   Copyright (C) 2002-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/libidn.map b/lib/libidn.map
index 907d95e..d89e315 100644
--- a/lib/libidn.map
+++ b/lib/libidn.map
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014 Simon Josefsson.
+# Copyright (C) 2009-2015 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/lib/nfkc.c b/lib/nfkc.c
index 2d8fb9d..fbea0c8 100644
--- a/lib/nfkc.c
+++ b/lib/nfkc.c
@@ -1,5 +1,5 @@
 /* nfkc.c --- Unicode normalization utilities.
-   Copyright (C) 2002-2014 Simon Josefsson
+   Copyright (C) 2002-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/pr29.c b/lib/pr29.c
index 460fb0e..da8f645 100644
--- a/lib/pr29.c
+++ b/lib/pr29.c
@@ -1,5 +1,5 @@
 /* pr29.h --- Detect strings that are non-idempotent under NFKC in Unicode 3.2.
-   Copyright (C) 2004-2014 Simon Josefsson
+   Copyright (C) 2004-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/pr29.h b/lib/pr29.h
index 9acd081..49e70d0 100644
--- a/lib/pr29.h
+++ b/lib/pr29.h
@@ -1,5 +1,5 @@
 /* pr29.h --- Detect strings which are non-idempotent under NFKC.
-   Copyright (C) 2004-2014 Simon Josefsson
+   Copyright (C) 2004-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/profiles.c b/lib/profiles.c
index f014231..66c209a 100644
--- a/lib/profiles.c
+++ b/lib/profiles.c
@@ -1,5 +1,5 @@
 /* profiles.c --- Definitions of stringprep profiles.
-   Copyright (C) 2002-2014 Simon Josefsson
+   Copyright (C) 2002-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/punycode.c b/lib/punycode.c
index 71b6d57..166569b 100644
--- a/lib/punycode.c
+++ b/lib/punycode.c
@@ -1,5 +1,5 @@
 /* punycode.c --- Implementation of punycode used to ASCII encode IDN's.
-   Copyright (C) 2002-2014 Simon Josefsson
+   Copyright (C) 2002-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
@@ -28,7 +28,28 @@
    not, see <http://www.gnu.org/licenses/>. */
 
 /*
- * This file is derived from RFC 3492bis written by Adam M. Costello.
+ * This file is derived from RFC 3492bis written by Adam M. Costello,
+ * downloaded from http://www.nicemice.net/idn/punycode-spec.gz on
+ * 2015-03-02 with SHA1 a966a8017f6be579d74a50a226accc7607c40133, a
+ * copy of which is stored in the GNU Libidn version controlled
+ * repository under doc/specification/punycode-spec.gz.
+ *
+ * The changes compared to Adam's file include: re-indentation, adding
+ * the license boilerplate and this comment, #include of config.h and
+ * punycode.h, adding GTK-DOC comments, changing the return code of
+ * punycode_encode and punycode_decode from enum to int, renaming the
+ * input_length_orig function input variable to input_length (and
+ * renaming the internal input_length variable to input_len) in
+ * punycode_encode.
+ *
+ * Adam's file contains the following:
+ *
+ * punycode-sample.c 2.0.0 (2004-Mar-21-Sun)
+ * http://www.nicemice.net/idn/
+ * Adam M. Costello
+ * http://www.nicemice.net/amc/
+ *
+ * This is ANSI C code (C89) implementing Punycode 1.0.x.
  *
  * Disclaimer and license: Regarding this entire document or any
  * portion of it (including the pseudocode and C code), the author
@@ -39,35 +60,13 @@
  * provided that redistributed derivative works do not contain
  * misleading author or version information.  Derivative works need
  * not be licensed under similar terms.
- *
- * Copyright (C) The Internet Society (2003).  All Rights Reserved.
- *
- * This document and translations of it may be copied and furnished to
- * others, and derivative works that comment on or otherwise explain it
- * or assist in its implementation may be prepared, copied, published
- * and distributed, in whole or in part, without restriction of any
- * kind, provided that the above copyright notice and this paragraph are
- * included on all such copies and derivative works.  However, this
- * document itself may not be modified in any way, such as by removing
- * the copyright notice or references to the Internet Society or other
- * Internet organizations, except as needed for the purpose of
- * developing Internet standards in which case the procedures for
- * copyrights defined in the Internet Standards process must be
- * followed, or as required to translate it into languages other than
- * English.
- *
- * The limited permissions granted above are perpetual and will not be
- * revoked by the Internet Society or its successors or assigns.
- *
- * This document and the information contained herein is provided on an
- * "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
- * TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
- * HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 #include <config.h>
+
+/**********************************************************/
+/* Implementation (would normally go in its own .c file): */
+
 #include <string.h>
 
 #include "punycode.h"
@@ -424,7 +423,7 @@ punycode_decode (size_t input_length,
       /* Insert n at position i of the output: */
 
       /* not needed for Punycode: */
-      /* if (basic(n)) return punycode_invalid_input; */
+      /* if (basic(n)) return punycode_bad_input; */
       if (out >= max_out)
        return punycode_big_output;
 
diff --git a/lib/punycode.h b/lib/punycode.h
index 01ed2a6..dff2105 100644
--- a/lib/punycode.h
+++ b/lib/punycode.h
@@ -1,5 +1,5 @@
 /* punycode.h --- Declarations for punycode functions.
-   Copyright (C) 2002-2014 Simon Josefsson
+   Copyright (C) 2002-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
@@ -28,8 +28,29 @@
    not, see <http://www.gnu.org/licenses/>. */
 
 /*
- * This file contains content derived from RFC 3492bis written by Adam
- * M. Costello.
+ * This file is derived from RFC 3492bis written by Adam M. Costello,
+ * downloaded from http://www.nicemice.net/idn/punycode-spec.gz on
+ * 2015-03-02 with SHA1 a966a8017f6be579d74a50a226accc7607c40133, a
+ * copy of which is stored in the GNU Libidn version controlled
+ * repository under doc/specification/punycode-spec.gz.
+ *
+ * The changes compared to Adam's file include: re-indentation, adding
+ * the license boilerplate and this comment, adding the #ifndef
+ * PUNYCODE_H and IDNAPI blocks, changing the return code of
+ * punycode_encode and punycode_decode from enum to int, simplifying
+ * the definition of punycode_uint by #include'ing idn-int.h and using
+ * uint32_t instead of limit.h-based code, adding Punycode_status and
+ * punycode_strerror, adding 'extern IDNAPI' declarations to function
+ * prototypes, and mentioning variable names in function prototypes.
+ *
+ * Adam's file contains the following:
+ *
+ * punycode-sample.c 2.0.0 (2004-Mar-21-Sun)
+ * http://www.nicemice.net/idn/
+ * Adam M. Costello
+ * http://www.nicemice.net/amc/
+ *
+ * This is ANSI C code (C89) implementing Punycode 1.0.x.
  *
  * Disclaimer and license: Regarding this entire document or any
  * portion of it (including the pseudocode and C code), the author
@@ -40,32 +61,6 @@
  * provided that redistributed derivative works do not contain
  * misleading author or version information.  Derivative works need
  * not be licensed under similar terms.
- *
- * Copyright (C) The Internet Society (2003).  All Rights Reserved.
- *
- * This document and translations of it may be copied and furnished to
- * others, and derivative works that comment on or otherwise explain it
- * or assist in its implementation may be prepared, copied, published
- * and distributed, in whole or in part, without restriction of any
- * kind, provided that the above copyright notice and this paragraph are
- * included on all such copies and derivative works.  However, this
- * document itself may not be modified in any way, such as by removing
- * the copyright notice or references to the Internet Society or other
- * Internet organizations, except as needed for the purpose of
- * developing Internet standards in which case the procedures for
- * copyrights defined in the Internet Standards process must be
- * followed, or as required to translate it into languages other than
- * English.
- *
- * The limited permissions granted above are perpetual and will not be
- * revoked by the Internet Society or its successors or assigns.
- *
- * This document and the information contained herein is provided on an
- * "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
- * TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
- * HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 #ifndef PUNYCODE_H
@@ -88,6 +83,9 @@ extern "C"
 {
 #endif
 
+/************************************************************/
+/* Public interface (would normally go in its own .h file): */
+
 #include <stddef.h>            /* size_t */
 #include <idn-int.h>           /* uint32_t */
 
@@ -110,7 +108,9 @@ extern "C"
   extern IDNAPI const char *punycode_strerror (Punycode_status rc);
 
 /* punycode_uint needs to be unsigned and needs to be */
-/* at least 26 bits wide.                             */
+/* at least 26 bits wide.  The particular type can be */
+/* specified by defining PUNYCODE_UINT, otherwise a   */
+/* suitable type will be chosen automatically.        */
 
   typedef uint32_t punycode_uint;
 
@@ -131,7 +131,7 @@ extern "C"
 
         input
             An array of code points.  They are presumed to be Unicode
-            code points, but that is not strictly REQUIRED.  The
+            code points, but that is not strictly necessary.  The
             array contains code points, not code units.  UTF-16 uses
             code units D800 through DFFF to refer to code points
             10000..10FFFF.  The code points D800..DFFF do not occur in
diff --git a/lib/strerror-idna.c b/lib/strerror-idna.c
index 5f6532a..0163c7e 100644
--- a/lib/strerror-idna.c
+++ b/lib/strerror-idna.c
@@ -1,5 +1,5 @@
 /* strerror-idna.c --- Convert IDNA errors into text.
-   Copyright (C) 2004-2014 Simon Josefsson
+   Copyright (C) 2004-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/strerror-pr29.c b/lib/strerror-pr29.c
index bcebbc9..68eabcc 100644
--- a/lib/strerror-pr29.c
+++ b/lib/strerror-pr29.c
@@ -1,5 +1,5 @@
 /* strerror-pr29.c --- Convert PR29 errors into text.
-   Copyright (C) 2004-2014 Simon Josefsson
+   Copyright (C) 2004-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/strerror-punycode.c b/lib/strerror-punycode.c
index fbae1a9..b10b9ae 100644
--- a/lib/strerror-punycode.c
+++ b/lib/strerror-punycode.c
@@ -1,5 +1,5 @@
 /* strerror-punycode.c --- Convert punycode errors into text.
-   Copyright (C) 2004-2014 Simon Josefsson
+   Copyright (C) 2004-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/strerror-stringprep.c b/lib/strerror-stringprep.c
index 2ee26c2..f3a8c9c 100644
--- a/lib/strerror-stringprep.c
+++ b/lib/strerror-stringprep.c
@@ -1,5 +1,5 @@
 /* strerror-stringprep.c --- Convert stringprep errors into text.
-   Copyright (C) 2004-2014 Simon Josefsson
+   Copyright (C) 2004-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/strerror-tld.c b/lib/strerror-tld.c
index 921df6d..b2a29df 100644
--- a/lib/strerror-tld.c
+++ b/lib/strerror-tld.c
@@ -1,5 +1,5 @@
 /* strerror-tld.c --- Convert TLD errors into text.
-   Copyright (C) 2004-2014 Simon Josefsson
+   Copyright (C) 2004-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/stringprep.c b/lib/stringprep.c
index 423f833..fc17c5c 100644
--- a/lib/stringprep.c
+++ b/lib/stringprep.c
@@ -1,5 +1,5 @@
 /* stringprep.c --- Core stringprep implementation.
-   Copyright (C) 2002-2014 Simon Josefsson
+   Copyright (C) 2002-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/stringprep.h b/lib/stringprep.h
index 9a70259..513483f 100644
--- a/lib/stringprep.h
+++ b/lib/stringprep.h
@@ -1,5 +1,5 @@
 /* stringprep.h --- Header file for stringprep functions.
-   Copyright (C) 2002-2014 Simon Josefsson
+   Copyright (C) 2002-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/tld.c b/lib/tld.c
index 5282acc..823620d 100644
--- a/lib/tld.c
+++ b/lib/tld.c
@@ -1,5 +1,5 @@
 /* tld.c --- Declarations for TLD restriction checking.
-   Copyright (C) 2004-2014 Simon Josefsson.
+   Copyright (C) 2004-2015 Simon Josefsson.
    Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
    Author: Thomas Jacob, Internet24.de
diff --git a/lib/tld.h b/lib/tld.h
index e6c189b..9604b0c 100644
--- a/lib/tld.h
+++ b/lib/tld.h
@@ -1,5 +1,5 @@
 /* tld.h --- Declarations for TLD restriction checking.
-   Copyright (C) 2004-2014 Simon Josefsson.
+   Copyright (C) 2004-2015 Simon Josefsson.
    Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
    Author: Thomas Jacob, Internet24.de
diff --git a/lib/toutf8.c b/lib/toutf8.c
index d856b69..b7126e2 100644
--- a/lib/toutf8.c
+++ b/lib/toutf8.c
@@ -1,5 +1,5 @@
 /* toutf8.c --- Convert strings from system locale into UTF-8.
-   Copyright (C) 2002-2014 Simon Josefsson
+   Copyright (C) 2002-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/lib/version.c b/lib/version.c
index d269ea0..2bab3d0 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -1,5 +1,5 @@
 /* version.c --- Version handling.
-   Copyright (C) 2002-2014 Simon Josefsson
+   Copyright (C) 2002-2015 Simon Josefsson
 
    This file is part of GNU Libidn.
 
diff --git a/libc/README b/libc/README
index 3249475..8511162 100644
--- a/libc/README
+++ b/libc/README
@@ -1,5 +1,5 @@
 Libidn libc/README -- Instructions for building as a GNU Libc add-on.
-Copyright (C) 2003-2014 Simon Josefsson
+Copyright (C) 2003-2015 Simon Josefsson
 See the end for copying conditions.
 
 GNU Libidn is now part of GNU Libc, so the stand-alone patch and
diff --git a/libc/example.c b/libc/example.c
index b419630..ea15f90 100644
--- a/libc/example.c
+++ b/libc/example.c
@@ -1,5 +1,5 @@
 /* example.c --- Example code showing how to use IDN enabled getaddrinfo().
- * Copyright (C) 2003-2014 Simon Josefsson
+ * Copyright (C) 2003-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/libc/getaddrinfo-idn.txt b/libc/getaddrinfo-idn.txt
index 0ffa35d..81500d5 100644
--- a/libc/getaddrinfo-idn.txt
+++ b/libc/getaddrinfo-idn.txt
@@ -1,5 +1,5 @@
 Libidn getaddrinfo-idn.txt -- Proposal for IDN support in POSIX getaddrinfo.
-Copyright (C) 2003-2014 Simon Josefsson
+Copyright (C) 2003-2015 Simon Josefsson
 See the end for copying conditions.
 
 Background
diff --git a/libidn.pc.in b/libidn.pc.in
index 41f5abc..70b5e59 100644
--- a/libidn.pc.in
+++ b/libidn.pc.in
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a pkg-config metadata file.
-# Copyright 2002-2014 Simon Josefsson
+# Copyright 2002-2015 Simon Josefsson
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/m4/update-header-version.m4 b/m4/update-header-version.m4
index 30b9cc3..d7fafc3 100644
--- a/m4/update-header-version.m4
+++ b/m4/update-header-version.m4
@@ -1,6 +1,5 @@
-# update-header-version.m4 serial 1
-dnl Copyright (C) 2008, 2010-2011, 2013-2014 Free Software Foundation,
-dnl Inc.
+# update-header-version.m4 serial 2
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/maint.mk b/maint.mk
index e5a3782..b6ec1b5 100644
--- a/maint.mk
+++ b/maint.mk
@@ -2,7 +2,7 @@
 # This Makefile fragment tries to be general-purpose enough to be
 # used by many projects via the gnulib maintainer-makefile module.
 
-## Copyright (C) 2001-2014 Free Software Foundation, Inc.
+## Copyright (C) 2001-2015 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
@@ -996,6 +996,14 @@ sc_prohibit_undesirable_word_seq:
          | grep -vE '$(ignore_undesirable_word_sequence_RE_)' | grep . \
          && { echo '$(ME): undesirable word sequence' >&2; exit 1; } || :
 
+# Except for shell files and for loops, double semicolon is probably a mistake
+sc_prohibit_double_semicolon:
+       @prohibit='; *;[        {} \]*(/[/*]|$$)'                       \
+       in_vc_files='\.[chly]$$'                                        \
+       exclude='\bfor *\(.*\)'                                         \
+       halt="Double semicolon detected"                                \
+         $(_sc_search_regexp)
+
 _ptm1 = use "test C1 && test C2", not "test C1 -''a C2"
 _ptm2 = use "test C1 || test C2", not "test C1 -''o C2"
 # Using test's -a and -o operators is not portable.
@@ -1640,14 +1648,14 @@ _gl_tight_scope: $(bin_PROGRAMS)
          perl -lne                                                     \
             '$(_gl_TS_function_match) and print "^$$1\$$"' $$hdr;      \
        ) | sort -u > $$t;                                              \
-       nm -e $(_gl_TS_obj_files)|$(SED) -n 's/.* T //p'|grep -Ev -f $$t \
+       nm -g $(_gl_TS_obj_files)|$(SED) -n 's/.* T //p'|grep -Ev -f $$t \
          && { echo the above functions should have static scope >&2;   \
               exit 1; } || : ;                                         \
        ( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_vars);       \
          perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"'           \
                $$hdr $(_gl_TS_other_headers)                           \
        ) | sort -u > $$t;                                              \
-       nm -e $(_gl_TS_obj_files) | $(SED) -n 's/.* [BCDGRS] //p'       \
+       nm -g $(_gl_TS_obj_files) | $(SED) -n 's/.* [BCDGRS] //p'       \
             | sort -u | grep -Ev -f $$t                                        
\
          && { echo the above variables should have static scope >&2;   \
               exit 1; } || :
diff --git a/po/LINGUAS b/po/LINGUAS
index f29ade7..11a8f86 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -7,6 +7,7 @@ eo
 fi
 fr
 hr
+hu
 id
 it
 ja
diff --git a/po/hr.po.in b/po/hu.po.in
similarity index 59%
copy from po/hr.po.in
copy to po/hu.po.in
index 36fb693..da001ee 100644
--- a/po/hr.po.in
+++ b/po/hu.po.in
@@ -1,157 +1,157 @@
-# Translation of libidn to Croatian.
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Hungarian translation for libidn.
+# Copyright (C) 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libidn package.
 #
-# Tomislav Krznar <address@hidden>, 2012.
+# BalÃ¡zs Ãr <address@hidden>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: libidn 1.25\n"
+"Project-Id-Version: libidn 1.29\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-05-23 10:37+0200\n"
-"PO-Revision-Date: 2012-09-27 23:16+0200\n"
-"Last-Translator: Tomislav Krznar <address@hidden>\n"
-"Language-Team: Croatian <address@hidden>\n"
-"Language: hr\n"
+"POT-Creation-Date: 2014-08-10 22:50+0200\n"
+"PO-Revision-Date: 2014-08-31 15:46+0200\n"
+"Last-Translator: BalÃ¡zs Ãr <address@hidden>\n"
+"Language-Team: Hungarian <address@hidden>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #: lib/strerror-idna.c:82 lib/strerror-pr29.c:66 lib/strerror-punycode.c:66
 #: lib/strerror-stringprep.c:86 lib/strerror-tld.c:68
 msgid "Success"
-msgstr "Uspjeh"
+msgstr "SikerÃ¼lt"
 
 #: lib/strerror-idna.c:86 lib/strerror-pr29.c:74
 msgid "String preparation failed"
-msgstr "Priprema niza nije uspjela"
+msgstr "A szÃ¶veg elÅkÃ©szÃtÃ©s sikertelen."
 
 #: lib/strerror-idna.c:90
 msgid "Punycode failed"
-msgstr "Punycode nije uspio"
+msgstr "Punycode sikertelen"
 
 #: lib/strerror-idna.c:94
 msgid "Non-digit/letter/hyphen in input"
-msgstr "Ne-broj/slovo/crtica u ulazu"
+msgstr "Nem szÃ¡m/betÅ±/kÃ¶tÅjel a bemeneten"
 
 #: lib/strerror-idna.c:98
 msgid "Forbidden leading or trailing minus sign (`-')"
-msgstr "Zabranjeni poÄetni ili zavrÅ¡ni minus (â-â)"
+msgstr "Tiltott kezdÅ vagy befejezÅ mÃnusz jel (â-â)"
 
 #: lib/strerror-idna.c:102
 msgid "Output would be too large or too small"
-msgstr "Izlaz bi bio prevelik ili premalen"
+msgstr "A kimenet tÃºl nagy vagy tÃºl kicsi lenne"
 
 #: lib/strerror-idna.c:106
 msgid "Input does not start with ACE prefix (`xn--')"
-msgstr "Ulaz ne poÄinje s ACE prefiksom (âxn--â)"
+msgstr "A bemenet nem ACE elÅtaggal (âxn--â) kezdÅdik"
 
 #: lib/strerror-idna.c:110
 msgid "String not idempotent under ToASCII"
-msgstr "Niz nije idempotentan prema ToASCII"
+msgstr "A szÃ¶veg nem idempotens a ToASCII alatt"
 
 #: lib/strerror-idna.c:114
 msgid "Input already contain ACE prefix (`xn--')"
-msgstr "Ulaz veÄ sadrÅ¾i ACE prefiks (âxn--â)"
+msgstr "A bemenet mÃ¡r tartalmaz ACE elÅtagot (âxn--â)"
 
 #: lib/strerror-idna.c:118 lib/strerror-tld.c:84
 msgid "System iconv failed"
-msgstr "iconv sustava nije uspio"
+msgstr "Rendszer iconv sikertelen"
 
 #: lib/strerror-idna.c:122 lib/strerror-stringprep.c:130 lib/strerror-tld.c:80
 msgid "Cannot allocate memory"
-msgstr "Ne mogu alocirati memoriju"
+msgstr "Nem lehet memÃ³riÃ¡t lefoglalni"
 
 #: lib/strerror-idna.c:126
 msgid "System dlopen failed"
-msgstr "dlopen sustava nije uspio"
+msgstr "Rendszer dlopen sikertelen"
 
 #: lib/strerror-idna.c:130 lib/strerror-pr29.c:78 lib/strerror-punycode.c:82
 #: lib/strerror-stringprep.c:134 lib/strerror-tld.c:92
 msgid "Unknown error"
-msgstr "Nepoznata greÅ¡ka"
+msgstr "Ismeretlen hiba"
 
 #: lib/strerror-pr29.c:70
 msgid "String not idempotent under Unicode NFKC normalization"
-msgstr "Niz nije idempotentan prema Unicode NFKC normalizaciji"
+msgstr "A szÃ¶veg nem idempotens a Unicode NFKC normalizÃ¡lÃ¡s alatt"
 
 #: lib/strerror-punycode.c:70
 msgid "Invalid input"
-msgstr "Neispravan ulaz"
+msgstr "ÃrvÃ©nytelen bemenet"
 
 #: lib/strerror-punycode.c:74 lib/strerror-stringprep.c:110
 msgid "Output would exceed the buffer space provided"
-msgstr "Izlaz bi prekoraÄio dostupan prostor meÄuspremnika"
+msgstr "A kimenet tÃºllÃ©pnÃ© a megadott puffermÃ©retet"
 
 #: lib/strerror-punycode.c:78
 msgid "String size limit exceeded"
-msgstr "PrekoraÄeno ograniÄenje veliÄine niza"
+msgstr "A szÃ¶vegmÃ©ret korlÃ¡t elÃ©rve"
 
 #: lib/strerror-stringprep.c:90
 msgid "Forbidden unassigned code points in input"
-msgstr "Zabranjene nedodijeljene kodne toÄke na ulazu"
+msgstr "Tiltott nem hozzÃ¡rendelt kÃ³dpontok a bemeneten"
 
 #: lib/strerror-stringprep.c:94
 msgid "Prohibited code points in input"
-msgstr "Zabranjene kodne toÄke na ulazu"
+msgstr "Tiltott kÃ³dpontok a bemeneten"
 
 #: lib/strerror-stringprep.c:98
 msgid "Conflicting bidirectional properties in input"
-msgstr "Konfliktna dvosmjerna svojstva u ulazu"
+msgstr "ÃtkÃ¶zÅ kÃ©tirÃ¡nyÃº tulajdonsÃ¡gok a bemeneten"
 
 #: lib/strerror-stringprep.c:102
 msgid "Malformed bidirectional string"
-msgstr "IzobliÄen dvosmjerni niz"
+msgstr "HelytelenÃ¼l formÃ¡zott kÃ©tirÃ¡nyÃº szÃ¶veg"
 
 #: lib/strerror-stringprep.c:106
 msgid "Prohibited bidirectional code points in input"
-msgstr "Zabranjene dvosmjerne kodne toÄke na ulazu"
+msgstr "Tiltott kÃ©tirÃ¡nyÃº kÃ³dpontok a bemeneten"
 
 #: lib/strerror-stringprep.c:114
 msgid "Error in stringprep profile definition"
-msgstr "GreÅ¡ka u stringprep definiciji profila"
+msgstr "Hiba a stringprep profil definÃciÃ³ban"
 
 #: lib/strerror-stringprep.c:118
 msgid "Flag conflict with profile"
-msgstr "Konflikt zastavice s profilom"
+msgstr "JelzÅÃ¼tkÃ¶zÃ©s a profillal"
 
 #: lib/strerror-stringprep.c:122
 msgid "Unknown profile"
-msgstr "Nepoznat profil"
+msgstr "Ismeretlen profil"
 
 #: lib/strerror-stringprep.c:126
 msgid "Unicode normalization failed (internal error)"
-msgstr "Unicode normalizacija nije uspjela (interna greÅ¡ka)"
+msgstr "Unicode normalizÃ¡lÃ¡s sikertelen (belsÅ hiba)"
 
 #: lib/strerror-tld.c:72
 msgid "Code points prohibited by top-level domain"
-msgstr "Kodne toÄke zabranjene vrÅ¡nom domenom"
+msgstr "A felsÅszintÅ± tartomÃ¡ny tiltja a kÃ³dpontokat"
 
 #: lib/strerror-tld.c:76
 msgid "Missing input"
-msgstr "Nedostaje ulaz"
+msgstr "HiÃ¡nyzÃ³ bemenet"
 
 #: lib/strerror-tld.c:88
 msgid "No top-level domain found in input"
-msgstr "Nije pronaÄena vrÅ¡na domena u ulazu"
+msgstr "Nem talÃ¡lhatÃ³ felsÅszintÅ± tartomÃ¡ny a bemeneten"
 
 #: src/idn.c:65
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "PokuÅ¡ajte â%s --helpâ za viÅ¡e informacija.\n"
+msgstr "TovÃ¡bbi informÃ¡ciÃ³kÃ©rt prÃ³bÃ¡lja a(z) â%s --helpâ 
parancsot.\n"
 
 #: src/idn.c:69
 #, c-format
 msgid "Usage: %s [OPTION]... [STRINGS]...\n"
-msgstr "Uporaba: %s [OPCIJA]... [NIZOVI]...\n"
+msgstr "HasznÃ¡lat: %s [KAPCSOLÃ]â¦ [SZÃVEGEK]â¦\n"
 
 #: src/idn.c:72
 msgid ""
 "Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
 "\n"
 msgstr ""
-"Pretvaranje NIZOVA ili standardnog ulaza u internacionalizirano ime domene 
(IDN).\n"
+"Internationalized Domain Name (IDN) Ã¡talakÃtott SZÃVEGEK vagy szabvÃ¡nyos 
bemenet.\n"
 "\n"
 
 #: src/idn.c:76
@@ -167,24 +167,26 @@ msgid ""
 "\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
-"SuÄelje naredbenog retka za biblioteku internacionaliziranih imena domena.\n"
+"Parancssoros felÃ¼let a nemzetkÃ¶zivÃ© tett tartomÃ¡nynÃ©v kÃ¶nyvtÃ¡rhoz.\n"
 "\n"
-"Svi znakovni nizovi bi trebali biti kodirani u skupu znakova odreÄenom\n"
-"vaÅ¡im lokalom.  Koristite â--debugâ kako biste ga otkrili. MoÅ¾ete ga\n"
-"promijeniti postavljanjem varijable okoline CHARSET.\n"
+"Minden szÃ¶veg a terÃ¼leti beÃ¡llÃtÃ¡s szerint elÅnyben rÃ©szesÃtett\n"
+"karakterkÃ©szlet hasznÃ¡latÃ¡val kÃ³dolva vÃ¡rt. HasznÃ¡lja a â--debugâ\n"
+"kapcsolÃ³t annak kiderÃtÃ©sÃ©re, hogy melyik ez a karakterkÃ©szlet.\n"
+"FelÃ¼lbÃrÃ¡lhatja a CHARSET kÃ¶rnyezeti vÃ¡ltozÃ³ beÃ¡llÃtÃ¡sban 
hasznÃ¡lt\n"
+"karakterkÃ©szletet.\n"
 "\n"
-"Za obradu niza koji poÄinje s â-â, npr. â-fooâ, koristite â--â 
za\n"
-"oznaÄavanje kraja popisa parametara, npr. âidn --quiet -a -- -fooâ.\n"
+"Egy â-â kezdetÅ± szÃ¶veg feldolgozÃ¡sÃ¡hoz, pÃ©ldÃ¡ul â-izÃ©â, 
hasznÃ¡lja a â--â\n"
+"jelet a paramÃ©terek vÃ©gÃ©nek jelzÃ©sÃ©hez, Ãºgymint âidn --quiet -a -- 
-izÃ©â.\n"
 "\n"
-"Obavezni argumenti dugaÄkih opcija takoÄer su obavezni i za kratke 
opcije.\n"
+"A hosszÃº kapcsolÃ³k kÃ¶telezÅ argumentumai a rÃ¶vid kapcsolÃ³knÃ¡l is 
kÃ¶telezÅek.\n"
 
 #: src/idn.c:88
 msgid ""
 "  -h, --help               Print help and exit\n"
 "  -V, --version            Print version and exit\n"
 msgstr ""
-"  -h, --help               IspiÅ¡i pomoÄ i izaÄi\n"
-"  -V, --version            IspiÅ¡i inaÄicu i izaÄi\n"
+"  -h, --help               SÃºgÃ³ kiÃrÃ¡sa Ã©s kilÃ©pÃ©s\n"
+"  -V, --version            VerziÃ³ kiÃrÃ¡sa Ã©s kilÃ©pÃ©s\n"
 
 #: src/idn.c:92
 msgid ""
@@ -194,31 +196,31 @@ msgid ""
 "  -a, --idna-to-ascii      Convert to ACE according to IDNA (default mode)\n"
 "  -u, --idna-to-unicode    Convert from ACE according to IDNA\n"
 msgstr ""
-"  -s, --stringprep         Pripremi niz prema nameprep profilu\n"
-"  -d, --punycode-decode    Dekodiraj Punycode\n"
-"  -e, --punycode-encode    Kodiraj Punycode\n"
-"  -a, --idna-to-ascii      Pretvori u ACE u skladu s IDNA (zadani naÄin)\n"
-"  -u, --idna-to-unicode    Pretvori iz ACE u skladu s IDNA\n"
+"  -s, --stringprep         SzÃ¶veg elÅkÃ©szÃtÃ©se a nameprep profil 
szerint\n"
+"  -d, --punycode-decode    Punycode dekÃ³dolÃ¡sa\n"
+"  -e, --punycode-encode    Punycode kÃ³dolÃ¡sa\n"
+"  -a, --idna-to-ascii      ÃtalakÃtÃ¡s ACE-re az IDNA szerint (alap mÃ³d)\n"
+"  -u, --idna-to-unicode    ÃtalakÃtÃ¡s ACE-rÅl az IDNA szerint\n"
 
 #: src/idn.c:99
 msgid ""
 "      --allow-unassigned   Toggle IDNA AllowUnassigned flag (default off)\n"
 "      --usestd3asciirules  Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
 msgstr ""
-"      --allow-unassigned   Promijeni IDNA AllowUnassigned zastavicu (poÄetno 
iskljuÄeno)\n"
-"      --usestd3asciirules  Promijeni IDNA UseSTD3ASCIIRules zastavicu 
(poÄetno iskljuÄeno)\n"
+"      --allow-unassigned   IDNA AllowUnassigned jelzÅ vÃ¡ltÃ¡sa (alap: 
off)\n"
+"      --usestd3asciirules  IDNA UseSTD3ASCIIRules jelzÅ vÃ¡ltÃ¡sa (alap: 
off)\n"
 
 #: src/idn.c:103
 msgid ""
 "      --no-tld             Don't check string for TLD specific rules\n"
 "                             Only for --idna-to-ascii and --idna-to-unicode\n"
 msgstr ""
-"      --no-tld             Ne provjeravaj TLD specifiÄna pravila u nizu\n"
-"                             Samo za --idna-to-ascii i --idna-to-unicode\n"
+"      --no-tld             Ne ellenÅrizzen szÃ¶veget TLD specifikus 
szabÃ¡lyokhoz\n"
+"                             Csak --idna-to-ascii Ã©s --idna-to-unicode 
esetÃ©n\n"
 
 #: src/idn.c:107
 msgid "  -n, --nfkc               Normalize string according to Unicode v3.2 
NFKC\n"
-msgstr "  -n, --nfkc               Normaliziraj niz u skladu s Unicode v3.2 
NFKC\n"
+msgstr "  -n, --nfkc               SzÃ¶veg normalizÃ¡lÃ¡sa a Unicode v3.2 NFKC 
szerint\n"
 
 #: src/idn.c:110
 msgid ""
@@ -227,9 +229,9 @@ msgid ""
 "                             `iSCSI', `Nodeprep', `Resourceprep', \n"
 "                             `trace', `SASLprep'\n"
 msgstr ""
-"  -p, --profile=NIZ        Koristi navedeni stringprep profil\n"
-"                             Ispravni stringprep profili: âNameprepâ,\n"
-"                             âiSCSIâ, âNodeprepâ, 
âResourceprepâ,\n"
+"  -p, --profile=SZÃVEG     InkÃ¡bb a megadott stringprep profil 
hasznÃ¡lata\n"
+"                             ÃrvÃ©nyes stringprep profilok: 
âNameprepâ,\n"
+"                             âiSCSIâ, âNodeprepâ, âResourceprepâ, 
\n"
 "                             âtraceâ, âSASLprepâ\n"
 
 #: src/idn.c:116
@@ -237,39 +239,39 @@ msgid ""
 "      --debug              Print debugging information\n"
 "      --quiet              Silent operation\n"
 msgstr ""
-"      --debug              IspiÅ¡i informacije za debugiranje\n"
-"      --quiet              Rad bez ispisa\n"
+"      --debug              HibakeresÃ©si informÃ¡ciÃ³k kiÃrÃ¡sa\n"
+"      --quiet              Csendes mÅ±kÃ¶dÃ©s\n"
 
 #: src/idn.c:172
 #, c-format
 msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
-msgstr "smijete navesti samo jednu od opcija -s, -e, -d, -a, -u ili -n"
+msgstr "csak a kÃ¶vetkezÅk egyike adhatÃ³ meg: -s, -e, -d, -a, -u vagy -n"
 
 #: src/idn.c:182
 #, c-format
 msgid "Charset `%s'.\n"
-msgstr "Skup znakova â%sâ.\n"
+msgstr "KarakterkÃ©szlet: â%sâ.\n"
 
 #: src/idn.c:187
 #, c-format
 msgid "Type each input string on a line by itself, terminated by a newline 
character.\n"
-msgstr "Unesite svaki ulazni niz u zasebnom retku, zavrÅ¡enom znakom novog 
retka.\n"
+msgstr "Minden bemeneti szÃ¶veget Ã¶nmagÃ¡val egy sorba gÃ©peljen be, egy Ãºj 
sor karakterrel lezÃ¡rva.\n"
 
 #: src/idn.c:202
 #, c-format
 msgid "input error"
-msgstr "ulazna greÅ¡ka"
+msgstr "bemeneti hiba"
 
 #: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
 #, c-format
 msgid "could not convert from %s to UTF-8"
-msgstr "ne mogu pretvoriti iz %s u UTF-8"
+msgstr "nem lehet Ã¡talakÃtani: %s -> UTF-8"
 
 #: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
 #: src/idn.c:551
 #, c-format
 msgid "could not convert from UTF-8 to UCS-4"
-msgstr "ne mogu pretvoriti iz UTF-8 u UCS-4"
+msgstr "nem lehet Ã¡talakÃtani: UTF-8 -> UCS-4"
 
 #: src/idn.c:237
 #, c-format
@@ -279,7 +281,7 @@ msgstr "stringprep_profile: %s"
 #: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
 #, c-format
 msgid "could not convert from UTF-8 to %s"
-msgstr "ne mogu pretvoriti iz UTF-8 u %s"
+msgstr "nem lehet Ã¡talakÃtani: UTF-8 -> %s"
 
 #: src/idn.c:295
 #, c-format
@@ -287,6 +289,7 @@ msgid "punycode_encode: %s"
 msgstr "punycode_encode: %s"
 
 #: src/idn.c:317
+#, c-format
 msgid "malloc"
 msgstr "malloc"
 
@@ -298,7 +301,7 @@ msgstr "punycode_decode: %s"
 #: src/idn.c:340 src/idn.c:364 src/idn.c:442
 #, c-format
 msgid "could not convert from UCS-4 to UTF-8"
-msgstr "ne mogu pretvoriti iz UCS-4 u UTF-8"
+msgstr "nem lehet Ã¡talakÃtani: UCS-4 -> UTF-8"
 
 #: src/idn.c:381
 #, c-format
@@ -313,7 +316,7 @@ msgstr "idna_to_unicode_8z4z (TLD): %s"
 #: src/idn.c:409 src/idn.c:482
 #, c-format
 msgid "tld_check_4z (position %lu): %s"
-msgstr "tld_check_4z (poloÅ¾aj %lu): %s"
+msgstr "tld_check_4z (%lu. pozÃciÃ³): %s"
 
 #: src/idn.c:412 src/idn.c:488
 #, c-format
@@ -328,4 +331,4 @@ msgstr "idna_to_unicode_8z4z: %s"
 #: src/idn.c:540
 #, c-format
 msgid "could not do NFKC normalization"
-msgstr "ne mogu izvrÅ¡iti NFKC normalizaciju"
+msgstr "nem lehet NFKC normalizÃ¡lÃ¡st vÃ©grehajtani"
diff --git a/po/vi.po.in b/po/vi.po.in
index 32f72b1..d82974d 100644
--- a/po/vi.po.in
+++ b/po/vi.po.in
@@ -1,18 +1,19 @@
 # Vietnamese Translation for LibIDN
-# Copyright Â© 2013 Free Software Foundation, Inc.
+# Báº£n dá»ch tiáº¿ng Viá»t dÃ nh cho libidn.
+# Copyright Â© 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libidn package.
 # Clytie Siddall <address@hidden>, 2005-2008.
-# Tráº§n Ngá»c QuÃ¢n <address@hidden>, 2012-2013.
+# Tráº§n Ngá»c QuÃ¢n <address@hidden>, 2012-2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libidn-1.27\n"
+"Project-Id-Version: libidn-1.29\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-06-05 21:59+0200\n"
-"PO-Revision-Date: 2013-06-10 09:07+0700\n"
+"POT-Creation-Date: 2014-08-10 22:50+0200\n"
+"PO-Revision-Date: 2014-08-12 07:59+0700\n"
 "Last-Translator: Tráº§n Ngá»c QuÃ¢n <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
-"Language: vi_VN\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,15 +32,15 @@ msgstr "Chuáº©n bá» chuá»i gáº·p lá»i"
 
 #: lib/strerror-idna.c:90
 msgid "Punycode failed"
-msgstr "punycode (mÃ£ yáº¿u Äuá»i) gáº·p lá»i"
+msgstr "Punycode (mÃ£ yáº¿u Äuá»i) gáº·p lá»i"
 
 #: lib/strerror-idna.c:94
 msgid "Non-digit/letter/hyphen in input"
-msgstr "Dá»¯ liá»u nháºp chá»©a kÃ½ tá»± khÃ¡c chá»¯ sá»/chá»¯/dáº¥u gáº¡ch 
ná»i"
+msgstr "Dá»¯ liá»u nháºp chá»©a kÃ½ tá»± khÃ´ng pháº£i lÃ  chá»¯ 
sá»/chá»¯/dáº¥u gáº¡ch ná»i"
 
 #: lib/strerror-idna.c:98
 msgid "Forbidden leading or trailing minus sign (`-')"
-msgstr "KhÃ´ng cho phÃ©p dáº¥u gáº¡ch ná»i (`-') Äi trÆ°á»c hay theo sau"
+msgstr "KhÃ´ng cho phÃ©p dáº¥u gáº¡ch ná»i (â-â) Äi trÆ°á»c hay theo 
sau"
 
 #: lib/strerror-idna.c:102
 msgid "Output would be too large or too small"
@@ -47,7 +48,7 @@ msgstr "Dá»¯ liá»u xuáº¥t sáº½ quÃ¡ lá»n hay quÃ¡ nhá»"
 
 #: lib/strerror-idna.c:106
 msgid "Input does not start with ACE prefix (`xn--')"
-msgstr "Dá»¯ liá»u nháºp khÃ´ng báº¯t Äáº§u báº±ng tiá»n tá» ACE (`xn--')"
+msgstr "Dá»¯ liá»u nháºp khÃ´ng báº¯t Äáº§u báº±ng tiá»n tá» ACE 
(âxn--â)"
 
 #: lib/strerror-idna.c:110
 msgid "String not idempotent under ToASCII"
@@ -55,7 +56,7 @@ msgstr "Chuá»i khÃ´ng trÃ¡nh nhÃ¢n lÃªn dÆ°á»i ToASCII"
 
 #: lib/strerror-idna.c:114
 msgid "Input already contain ACE prefix (`xn--')"
-msgstr "Dá»¯ liá»u nháºp ÄÃ£ sáºµn chá»©a tiá»n tá» ACE (`xn--')"
+msgstr "Dá»¯ liá»u nháºp ÄÃ£ sáºµn chá»©a tiá»n tá» ACE (âxn--â)"
 
 #: lib/strerror-idna.c:118 lib/strerror-tld.c:84
 msgid "System iconv failed"
@@ -141,7 +142,7 @@ msgstr "KhÃ´ng tÃ¬m tháº¥y miá»n cáº¥p Äáº§u trong dá»¯ 
liá»u nháºp"
 #: src/idn.c:65
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "Thá» lá»nh `%s --help' Äá» xem thÃªm thÃ´ng tin.\n"
+msgstr "Thá» lá»nh â%s --helpâ Äá» xem thÃªm thÃ´ng tin.\n"
 
 #: src/idn.c:69
 #, c-format
@@ -214,8 +215,8 @@ msgid ""
 "      --no-tld             Don't check string for TLD specific rules\n"
 "                             Only for --idna-to-ascii and --idna-to-unicode\n"
 msgstr ""
-"  -t, --no-tld             KhÃ´ng kiá»m tra chuá»i cho quy táº¯c Äáº·c 
trÆ°ng TLD\n"
-"                            Chá» dÃ nh cho \"--idna-to-ascii\" vÃ  
\"--idna-to-unicode\"\n"
+"  -t, --no-tld             KhÃ´ng kiá»m tra chuá»i cho quy táº¯c Äáº·c 
táº£ TLD\n"
+"                            Chá» dÃ nh cho --idna-to-ascii vÃ  
--idna-to-unicode\"\n"
 
 #: src/idn.c:107
 msgid "  -n, --nfkc               Normalize string according to Unicode v3.2 
NFKC\n"
@@ -229,9 +230,9 @@ msgid ""
 "                             `trace', `SASLprep'\n"
 msgstr ""
 "  -p, --profile=CHUá»I      DÃ¹ng há» sÆ¡ stringprep ÄÃ£ chá» Äá»nh 
thay vÃ o ÄÃ³\n"
-"                             CÃ¡c há» sÆ¡ stringprep há»£p lá»: 
`Nameprep',\n"
-"                             `iSCSI', `Nodeprep', `Resourceprep', \n"
-"                             `trace', `SASLprep'\n"
+"                             CÃ¡c há» sÆ¡ stringprep há»£p lá»: 
âNameprepâ,\n"
+"                             âiSCSIâ, âNodeprepâ, âResourceprepâ, 
\n"
+"                             âtraceâ, âSASLprepâ\n"
 
 #: src/idn.c:116
 msgid ""
@@ -239,7 +240,7 @@ msgid ""
 "      --quiet              Silent operation\n"
 msgstr ""
 "      --debug              In ra thÃ´ng tin gá»¡ lá»i\n"
-"      --quiet              KhÃ´ng xuáº¥t thÃ´ng Äiá»p\n"
+"      --quiet              Thá»±c hiá»n á» cháº¿ Äá» im láº·ng\n"
 
 #: src/idn.c:172
 #, c-format
@@ -288,6 +289,7 @@ msgid "punycode_encode: %s"
 msgstr "punycode_encode: %s"
 
 #: src/idn.c:317
+#, c-format
 msgid "malloc"
 msgstr "malloc"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 9e07f71..216ca63 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002-2014 Simon Josefsson
+# Copyright (C) 2002-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/src/idn.c b/src/idn.c
index 13deb9c..0d32bbf 100644
--- a/src/idn.c
+++ b/src/idn.c
@@ -1,5 +1,5 @@
 /* idn.c --- Command line interface to libidn.
- * Copyright (C) 2003-2014 Simon Josefsson
+ * Copyright (C) 2003-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
@@ -48,7 +48,7 @@
 #include "idn_cmd.h"
 
 #define GREETING \
-  "Copyright 2002-2014 Simon Josefsson.\n"                              \
+  "Copyright 2002-2015 Simon Josefsson.\n"                              \
   "GNU Libidn is free software with ABSOLUTELY NO WARRANTY.  For more\n" \
   "information about these matters, see <http://www.gnu.org/licenses/>.\n"
 
diff --git a/src/idn.ggo b/src/idn.ggo
index 5f4683f..dee5fdf 100644
--- a/src/idn.ggo
+++ b/src/idn.ggo
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2014 Simon Josefsson.
+# Copyright (C) 2003-2015 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/src/idna.el b/src/idna.el
index 5fbbc6a..47a22e1 100644
--- a/src/idna.el
+++ b/src/idna.el
@@ -1,6 +1,6 @@
 ;;; idna.el --- Internationalizing Domain Names in Applications.
 
-;; Copyright (C) 2003-2014 Simon Josefsson
+;; Copyright (C) 2003-2015 Simon Josefsson
 ;; Keywords: idna, idn, domain name, internationalization
 
 ;; This file is part of GNU Libidn.
diff --git a/src/punycode.el b/src/punycode.el
index b89ba5e..f3873a3 100644
--- a/src/punycode.el
+++ b/src/punycode.el
@@ -1,6 +1,6 @@
 ;;; punycode.el --- An ASCII compatible Unicode encoding format.
 
-;; Copyright (C) 2003-2014 Simon Josefsson
+;; Copyright (C) 2003-2015 Simon Josefsson
 ;; Keywords: punycode, idna, idn, unicode, encoding
 
 ;; This file is part of GNU Libidn.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a75c23a..0f491ec 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002-2014 Simon Josefsson
+# Copyright (C) 2002-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/tests/libidn.supp b/tests/libidn.supp
index 439b290..f8d95dd 100644
--- a/tests/libidn.supp
+++ b/tests/libidn.supp
@@ -1,5 +1,5 @@
 # libidn.supp -- Valgrind suppression file for Libidn
-# Copyright (C) 2012-2014 Simon Josefsson
+# Copyright (C) 2012-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/tests/tst_idna.c b/tests/tst_idna.c
index e2aef35..e7e4df0 100644
--- a/tests/tst_idna.c
+++ b/tests/tst_idna.c
@@ -1,5 +1,5 @@
 /* tst_idna.c --- Self tests for idna_to_ascii().
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_idna2.c b/tests/tst_idna2.c
index bc7736b..d67dbe4 100644
--- a/tests/tst_idna2.c
+++ b/tests/tst_idna2.c
@@ -1,5 +1,5 @@
 /* tst_idna2.c --- Self tests for idna_to_ascii_8z().
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_idna3.c b/tests/tst_idna3.c
index f2e112e..1c64a9c 100644
--- a/tests/tst_idna3.c
+++ b/tests/tst_idna3.c
@@ -1,5 +1,5 @@
 /* tst_idna3.c --- Self tests for upper-case XN-- regression.
- * Copyright (C) 2011-2014 Simon Josefsson
+ * Copyright (C) 2011-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_idna4.c b/tests/tst_idna4.c
index 7a71515..72d676f 100644
--- a/tests/tst_idna4.c
+++ b/tests/tst_idna4.c
@@ -1,5 +1,5 @@
 /* tst_idna4.c --- Self tests for memory leak regression.
- * Copyright (C) 2011-2014 Simon Josefsson
+ * Copyright (C) 2011-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_nfkc.c b/tests/tst_nfkc.c
index 4c6952a..51fa064 100644
--- a/tests/tst_nfkc.c
+++ b/tests/tst_nfkc.c
@@ -1,5 +1,5 @@
 /* tst_nfkc.c --- Self tests for stringprep_utf8_nfkc_normalize().
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_pr29.c b/tests/tst_pr29.c
index 6ce2d0c..0b67656 100644
--- a/tests/tst_pr29.c
+++ b/tests/tst_pr29.c
@@ -1,5 +1,5 @@
 /* tst_pr29.c --- Self tests for pr29_*().
- * Copyright (C) 2004-2014 Simon Josefsson
+ * Copyright (C) 2004-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_punycode.c b/tests/tst_punycode.c
index e8f305b..601671d 100644
--- a/tests/tst_punycode.c
+++ b/tests/tst_punycode.c
@@ -1,5 +1,5 @@
 /* tst_punycode.c --- Self tests for punycode.
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_strerror.c b/tests/tst_strerror.c
index 18fe056..929c96b 100644
--- a/tests/tst_strerror.c
+++ b/tests/tst_strerror.c
@@ -1,5 +1,5 @@
 /* tst_strerror.c --- Self tests for *_strerror().
- * Copyright (C) 2004-2014 Simon Josefsson
+ * Copyright (C) 2004-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_stringprep.c b/tests/tst_stringprep.c
index cf58661..1856d35 100644
--- a/tests/tst_stringprep.c
+++ b/tests/tst_stringprep.c
@@ -1,5 +1,5 @@
 /* tst_stringprep.c --- Self tests for stringprep().
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_symbols.c b/tests/tst_symbols.c
index c06fc2a..e09f009 100644
--- a/tests/tst_symbols.c
+++ b/tests/tst_symbols.c
@@ -1,5 +1,5 @@
 /* tst_symbols.c --- Test if all exported symbols are available.
- * Copyright (C) 2010-2014 Simon Josefsson
+ * Copyright (C) 2010-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_tld.c b/tests/tst_tld.c
index 3c408ba..69a6a11 100644
--- a/tests/tst_tld.c
+++ b/tests/tst_tld.c
@@ -1,5 +1,5 @@
 /* tst_tld.c --- Self tests for tld_*().
- * Copyright (C) 2004-2014 Simon Josefsson
+ * Copyright (C) 2004-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_toutf8.c b/tests/tst_toutf8.c
index fdfdedc..23cf35f 100644
--- a/tests/tst_toutf8.c
+++ b/tests/tst_toutf8.c
@@ -1,5 +1,5 @@
 /* tst_toutf8.c --- Self tests for UTF-8 conversion functions.
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/utils.c b/tests/utils.c
index 3a52c43..6d302b0 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -1,5 +1,5 @@
 /* utils.c --- Self test utilities.
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/utils.h b/tests/utils.h
index 6d238e0..1666c6c 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -1,5 +1,5 @@
 /* utils.h --- Prototypes for self test utilities.
- * Copyright (C) 2002-2014 Simon Josefsson
+ * Copyright (C) 2002-2015 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/windows/include/ac-stdint.h b/windows/include/ac-stdint.h
index b6aafd9..58b0302 100644
--- a/windows/include/ac-stdint.h
+++ b/windows/include/ac-stdint.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2008-2015 Free Software Foundation, Inc.
    Written by Adam Strzelecki <address@hidden>
 
    This file is part of GNU Libidn.
diff --git a/windows/include/config.h b/windows/include/config.h
index 1a365a7..0f6ff7c 100644
--- a/windows/include/config.h
+++ b/windows/include/config.h
@@ -1,5 +1,5 @@
 /* config.h --- System definitions for Windows
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 Free Software Foundation, Inc.
 
    This file is part of GNU Libidn.
 
diff --git a/windows/include/idn-int.h b/windows/include/idn-int.h
index 42e299c..b9dab18 100644
--- a/windows/include/idn-int.h
+++ b/windows/include/idn-int.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2008-2015 Free Software Foundation, Inc.
    Written by Adam Strzelecki <address@hidden>
 
    This file is part of GNU Libidn.
diff --git a/windows/include/stdbool.h b/windows/include/stdbool.h
index da00538..c789c92 100644
--- a/windows/include/stdbool.h
+++ b/windows/include/stdbool.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2014 Free Software Foundation, Inc.
+/* Copyright (C) 2008-2015 Free Software Foundation, Inc.
    Written by Adam Strzelecki <address@hidden>
 
    This file is part of GNU Libidn.
diff --git a/windows/libidn4win.mk b/windows/libidn4win.mk
index aed708e..effce9e 100644
--- a/windows/libidn4win.mk
+++ b/windows/libidn4win.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2014 Simon Josefsson
+# Copyright (C) 2011-2015 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #


hooks/post-receive
-- 
GNU libidn
[Prev in Thread]
Current Thread
[Next in Thread]
[SCM] GNU libidn branch, master, updated. libidn-1-29-15-g8fb4aad, Simon Josefsson <=
Prev by Date: [SCM] GNU libidn annotated tag, libidn-1-30, created. libidn-1-30
Previous by thread: [SCM] GNU libidn annotated tag, libidn-1-30, created. libidn-1-30
Index(es):
- Date
- Thread