diff options
Diffstat (limited to 'gettext-tools/libgettextpo')
206 files changed, 443 insertions, 314 deletions
diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am index dfbf40c..36bd700 100644 --- a/gettext-tools/libgettextpo/Makefile.am +++ b/gettext-tools/libgettextpo/Makefile.am @@ -1,6 +1,5 @@ ## Makefile for the gettext-tools/libgettextpo subdirectory of GNU gettext -## Copyright (C) 1995-1998, 2000-2011, 2015 Free Software Foundation, -## Inc. +## Copyright (C) 1995-1998, 2000-2011, 2015-2016 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -100,7 +99,7 @@ libgettextpo_la_AUXSOURCES = \ # Libtool's library version information for libgettextpo. # See the libtool documentation, section "Library interface versions". LTV_CURRENT=5 -LTV_REVISION=3 +LTV_REVISION=4 LTV_AGE=5 # How to build libgettextpo.la. @@ -118,6 +117,11 @@ libgettextpo_la_SOURCES += ../woe32dll/gettextpo-exports.c libgettextpo_la_LDFLAGS += -Wl,--export-all-symbols endif +# OS/2 does not support a DLL name longer than 8 characters. +if OS2 +libgettextpo_la_LDFLAGS += -os2dllname gtpo +endif + # Version information according to Woe32 conventions. EXTRA_DIST += libgettextpo.rc if WOE32 diff --git a/gettext-tools/libgettextpo/Makefile.gnulib b/gettext-tools/libgettextpo/Makefile.gnulib index 35561c1..c68e6f5 100644 --- a/gettext-tools/libgettextpo/Makefile.gnulib +++ b/gettext-tools/libgettextpo/Makefile.gnulib @@ -1,6 +1,6 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -429,6 +429,14 @@ V_GPERF_0 = @echo " GPERF " $@; ## end gnulib module gperf +## begin gnulib module hard-locale + +libgnu_la_SOURCES += hard-locale.c + +EXTRA_DIST += hard-locale.h + +## end gnulib module hard-locale + ## begin gnulib module hash libgnu_la_SOURCES += hash.h hash.c diff --git a/gettext-tools/libgettextpo/Makefile.in b/gettext-tools/libgettextpo/Makefile.in index fd0f072..5f9550d 100644 --- a/gettext-tools/libgettextpo/Makefile.in +++ b/gettext-tools/libgettextpo/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -115,25 +115,28 @@ host_triplet = @host@ # Tell the mingw or Cygwin linker which symbols to export. @WOE32DLL_TRUE@am__append_1 = ../woe32dll/gettextpo-exports.c @WOE32DLL_TRUE@am__append_2 = -Wl,--export-all-symbols -@WOE32_TRUE@am__append_3 = libgettextpo.res.lo -@GL_COND_LIBTOOL_TRUE@am__append_4 = $(LTLIBICONV) $(LTLIBICONV) -@LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_TRUE@am__append_5 = uniconv/u8-conv-from-enc.c -@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_TRUE@am__append_6 = unictype/ctype_alpha.c -@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_TRUE@am__append_7 = unictype/ctype_space.c -@LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS_TRUE@am__append_8 = unilbrk/u8-possible-linebreaks.c -@LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS_TRUE@am__append_9 = unilbrk/u8-width-linebreaks.c -@LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS_TRUE@am__append_10 = unilbrk/ulc-width-linebreaks.c -@LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_TRUE@am__append_11 = unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c -@LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE@am__append_12 = unistr/u8-check.c -@LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE@am__append_13 = unistr/u8-mblen.c -@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@am__append_14 = unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c -@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__append_15 = unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c -@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_16 = unistr/u8-mbtoucr.c -@LIBUNISTRING_COMPILE_UNISTR_U8_NEXT_TRUE@am__append_17 = unistr/u8-next.c -@LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@am__append_18 = unistr/u8-prev.c -@LIBUNISTRING_COMPILE_UNISTR_U8_STRMBTOUC_TRUE@am__append_19 = unistr/u8-strmbtouc.c -@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_20 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c -@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_21 = uniwidth/width.c + +# OS/2 does not support a DLL name longer than 8 characters. +@OS2_TRUE@am__append_3 = -os2dllname gtpo +@WOE32_TRUE@am__append_4 = libgettextpo.res.lo +@GL_COND_LIBTOOL_TRUE@am__append_5 = $(LTLIBICONV) $(LTLIBICONV) +@LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_TRUE@am__append_6 = uniconv/u8-conv-from-enc.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_TRUE@am__append_7 = unictype/ctype_alpha.c +@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_TRUE@am__append_8 = unictype/ctype_space.c +@LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS_TRUE@am__append_9 = unilbrk/u8-possible-linebreaks.c +@LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS_TRUE@am__append_10 = unilbrk/u8-width-linebreaks.c +@LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS_TRUE@am__append_11 = unilbrk/ulc-width-linebreaks.c +@LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_TRUE@am__append_12 = unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c +@LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE@am__append_13 = unistr/u8-check.c +@LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE@am__append_14 = unistr/u8-mblen.c +@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@am__append_15 = unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c +@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__append_16 = unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c +@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_17 = unistr/u8-mbtoucr.c +@LIBUNISTRING_COMPILE_UNISTR_U8_NEXT_TRUE@am__append_18 = unistr/u8-next.c +@LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@am__append_19 = unistr/u8-prev.c +@LIBUNISTRING_COMPILE_UNISTR_U8_STRMBTOUC_TRUE@am__append_20 = unistr/u8-strmbtouc.c +@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_21 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c +@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_22 = uniwidth/width.c subdir = libgettextpo ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = \ @@ -166,6 +169,7 @@ am__aclocal_m4_deps = \ $(top_srcdir)/gnulib-m4/ctype.m4 \ $(top_srcdir)/gnulib-m4/curses.m4 \ $(top_srcdir)/gnulib-m4/dirent_h.m4 \ + $(top_srcdir)/gnulib-m4/dirfd.m4 \ $(top_srcdir)/gnulib-m4/double-slash-root.m4 \ $(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \ $(top_srcdir)/gnulib-m4/eaccess.m4 \ @@ -202,6 +206,7 @@ am__aclocal_m4_deps = \ $(top_srcdir)/gnulib-m4/gettimeofday.m4 \ $(top_srcdir)/gnulib-m4/gnulib-common.m4 \ $(top_srcdir)/gnulib-m4/gnulib-comp.m4 \ + $(top_srcdir)/gnulib-m4/hard-locale.m4 \ $(top_srcdir)/gnulib-m4/iconv_h.m4 \ $(top_srcdir)/gnulib-m4/iconv_open.m4 \ $(top_srcdir)/gnulib-m4/include_next.m4 \ @@ -494,7 +499,7 @@ am__libgnu_la_SOURCES_DIST = basename.h basename.c c-ctype.h c-ctype.c \ c-strstr.c concat-filename.c diffseq.h error-progname.h \ error-progname.c exitfail.c fd-hook.c file-ostream.c fstrcmp.h \ fstrcmp.c fwriteerror.h fwriteerror.c gcd.h gcd.c gettext.h \ - hash.h hash.c gl_linked_list.h gl_linked_list.c \ + hard-locale.c hash.h hash.c gl_linked_list.h gl_linked_list.c \ gl_anylinked_list1.h gl_anylinked_list2.h gl_list.h gl_list.c \ localcharset.h localcharset.c glthread/lock.h glthread/lock.c \ malloca.c markup.h markup.c mbswidth.h mbswidth.c minmax.h \ @@ -544,10 +549,10 @@ am__libgnu_la_SOURCES_DIST = basename.h basename.c c-ctype.h c-ctype.c \ am_libgnu_la_OBJECTS = basename.lo c-ctype.lo c-strcasecmp.lo \ c-strncasecmp.lo c-strstr.lo concat-filename.lo \ error-progname.lo exitfail.lo fd-hook.lo file-ostream.lo \ - fstrcmp.lo fwriteerror.lo gcd.lo hash.lo gl_linked_list.lo \ - gl_list.lo localcharset.lo glthread/lock.lo malloca.lo \ - markup.lo mbswidth.lo ostream.lo progname.lo striconv.lo \ - striconveh.lo striconveha.lo glthread/threadlib.lo \ + fstrcmp.lo fwriteerror.lo gcd.lo hard-locale.lo hash.lo \ + gl_linked_list.lo gl_list.lo localcharset.lo glthread/lock.lo \ + malloca.lo markup.lo mbswidth.lo ostream.lo progname.lo \ + striconv.lo striconveh.lo striconveha.lo glthread/threadlib.lo \ glthread/tls.lo $(am__objects_3) $(am__objects_4) \ $(am__objects_5) unilbrk/lbrktables.lo $(am__objects_6) \ $(am__objects_7) unilbrk/ulc-common.lo $(am__objects_8) \ @@ -1991,7 +1996,7 @@ EXTRA_DIST = libgettextpo.rc gettext-po.in.h gnulib-m4/gnulib-cache.m4 \ fd-hook.h file-ostream.h file-ostream.c file_ostream.priv.h \ file_ostream.vt.h file-ostream.oo.c file-ostream.oo.h \ filename.h float.c float.in.h itold.c fopen.c fstat.c \ - getdelim.c getline.c gettimeofday.c \ + getdelim.c getline.c gettimeofday.c hard-locale.h \ $(top_srcdir)/../build-aux/config.rpath iconv.in.h \ iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \ iconv_open-osf.h iconv_open-solaris.h iconv.c iconv_close.c \ @@ -2055,7 +2060,7 @@ BUILT_SOURCES = gettext-po.h $(ALLOCA_H) configmake.h $(ERRNO_H) \ $(LIBUNISTRING_UNICTYPE_H) $(LIBUNISTRING_UNILBRK_H) unistd.h \ $(LIBUNISTRING_UNISTR_H) $(LIBUNISTRING_UNITYPES_H) \ $(LIBUNISTRING_UNIWIDTH_H) wchar.h wctype.h -MOSTLYCLEANFILES = core *.stackdump $(am__append_3) config.h \ +MOSTLYCLEANFILES = core *.stackdump $(am__append_4) config.h \ config.h-t core *.stackdump alloca.h alloca.h-t errno.h \ errno.h-t fcntl.h fcntl.h-t float.h float.h-t iconv.h \ iconv.h-t iconv_open-aix.h-t iconv_open-hpux.h-t \ @@ -2148,7 +2153,7 @@ libgettextpo_la_AUXSOURCES = \ # Libtool's library version information for libgettextpo. # See the libtool documentation, section "Library interface versions". LTV_CURRENT = 5 -LTV_REVISION = 3 +LTV_REVISION = 4 LTV_AGE = 5 # How to build libgettextpo.la. @@ -2157,7 +2162,8 @@ LTV_AGE = 5 libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) $(LTLIBUNISTRING) libgettextpo_la_LDFLAGS = -version-info \ $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) -rpath $(libdir) \ - @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined $(am__append_2) + @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined $(am__append_2) \ + $(am__append_3) @WOE32_FALSE@WOE32_LIBADD = @WOE32_TRUE@WOE32_LIBADD = libgettextpo.res.lo libgnu_la_SOURCES = basename.h basename.c c-ctype.h c-ctype.c \ @@ -2165,20 +2171,20 @@ libgnu_la_SOURCES = basename.h basename.c c-ctype.h c-ctype.c \ c-strstr.c concat-filename.c diffseq.h error-progname.h \ error-progname.c exitfail.c fd-hook.c file-ostream.c fstrcmp.h \ fstrcmp.c fwriteerror.h fwriteerror.c gcd.h gcd.c gettext.h \ - hash.h hash.c gl_linked_list.h gl_linked_list.c \ + hard-locale.c hash.h hash.c gl_linked_list.h gl_linked_list.c \ gl_anylinked_list1.h gl_anylinked_list2.h gl_list.h gl_list.c \ localcharset.h localcharset.c glthread/lock.h glthread/lock.c \ malloca.c markup.h markup.c mbswidth.h mbswidth.c minmax.h \ ostream.c progname.h progname.c size_max.h striconv.h \ striconv.c striconveh.h striconveh.c striconveha.h \ striconveha.c glthread/threadlib.c glthread/tls.h \ - glthread/tls.c $(am__append_5) $(am__append_6) $(am__append_7) \ - unilbrk/lbrktables.c $(am__append_8) $(am__append_9) \ - unilbrk/ulc-common.c $(am__append_10) unistd.c \ - $(am__append_11) $(am__append_12) $(am__append_13) \ - $(am__append_14) $(am__append_15) $(am__append_16) \ - $(am__append_17) $(am__append_18) $(am__append_19) \ - $(am__append_20) $(am__append_21) wctype-h.c xalloc.h \ + glthread/tls.c $(am__append_6) $(am__append_7) $(am__append_8) \ + unilbrk/lbrktables.c $(am__append_9) $(am__append_10) \ + unilbrk/ulc-common.c $(am__append_11) unistd.c \ + $(am__append_12) $(am__append_13) $(am__append_14) \ + $(am__append_15) $(am__append_16) $(am__append_17) \ + $(am__append_18) $(am__append_19) $(am__append_20) \ + $(am__append_21) $(am__append_22) wctype-h.c xalloc.h \ xmalloc.c xstrdup.c xconcat-filename.c xerror.h xerror.c \ gl_xlist.h gl_xlist.c xmalloca.c xsize.h xsize.c xstriconv.h \ xstriconv.c xvasprintf.h xvasprintf.c xasprintf.c @@ -2194,7 +2200,7 @@ EXTRA_libgnu_la_SOURCES = close.c error.c file-ostream.oo.c float.c \ asnprintf.c printf-args.c printf-parse.c vasnprintf.c \ asprintf.c vasprintf.c wcwidth.c libgnu_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LTLIBICONV) \ - $(LTLIBINTL) $(LTLIBTHREAD) $(LTLIBUNISTRING) $(am__append_4) + $(LTLIBINTL) $(LTLIBTHREAD) $(LTLIBUNISTRING) $(am__append_5) # Use this preprocessor expression to decide whether #include_next works. # Do not rely on a 'configure'-time test for this, since the expression diff --git a/gettext-tools/libgettextpo/alignof.h b/gettext-tools/libgettextpo/alignof.h index be53fa5..9b51af0 100644 --- a/gettext-tools/libgettextpo/alignof.h +++ b/gettext-tools/libgettextpo/alignof.h @@ -1,5 +1,5 @@ /* Determine alignment of types. - Copyright (C) 2003-2004, 2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 2006, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/alloca.in.h b/gettext-tools/libgettextpo/alloca.in.h index b334262..8603e79 100644 --- a/gettext-tools/libgettextpo/alloca.in.h +++ b/gettext-tools/libgettextpo/alloca.in.h @@ -1,5 +1,5 @@ /* Memory allocation on the stack. - Copyright (C) 1995, 1999, 2001-2007, 2015 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2007, 2015-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/asnprintf.c b/gettext-tools/libgettextpo/asnprintf.c index d6776ca..f23b776 100644 --- a/gettext-tools/libgettextpo/asnprintf.c +++ b/gettext-tools/libgettextpo/asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/asprintf.c b/gettext-tools/libgettextpo/asprintf.c index 06ae3dd..d0ca5f2 100644 --- a/gettext-tools/libgettextpo/asprintf.c +++ b/gettext-tools/libgettextpo/asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2015 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/basename.c b/gettext-tools/libgettextpo/basename.c index 56421aa..3518ade 100644 --- a/gettext-tools/libgettextpo/basename.c +++ b/gettext-tools/libgettextpo/basename.c @@ -1,5 +1,5 @@ /* Return the name-within-directory of a file name. - Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015 Free Software + Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015-2016 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/gettext-tools/libgettextpo/basename.h b/gettext-tools/libgettextpo/basename.h index 489cc67..2d7f0ad 100644 --- a/gettext-tools/libgettextpo/basename.h +++ b/gettext-tools/libgettextpo/basename.h @@ -1,5 +1,5 @@ /* Pathname hacking. - Copyright (C) 2001-2003, 2010, 2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2010, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/c-ctype.h b/gettext-tools/libgettextpo/c-ctype.h index 1512530..717ae78 100644 --- a/gettext-tools/libgettextpo/c-ctype.h +++ b/gettext-tools/libgettextpo/c-ctype.h @@ -5,7 +5,7 @@ <ctype.h> functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/c-strcase.h b/gettext-tools/libgettextpo/c-strcase.h index f25bcca..7e570f5 100644 --- a/gettext-tools/libgettextpo/c-strcase.h +++ b/gettext-tools/libgettextpo/c-strcase.h @@ -1,5 +1,5 @@ /* Case-insensitive string comparison functions in C locale. - Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2015 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/c-strcasecmp.c b/gettext-tools/libgettextpo/c-strcasecmp.c index 6deb6d1..bd113b7 100644 --- a/gettext-tools/libgettextpo/c-strcasecmp.c +++ b/gettext-tools/libgettextpo/c-strcasecmp.c @@ -1,5 +1,5 @@ /* c-strcasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/c-strcaseeq.h b/gettext-tools/libgettextpo/c-strcaseeq.h index 28dc55e..ed57251 100644 --- a/gettext-tools/libgettextpo/c-strcaseeq.h +++ b/gettext-tools/libgettextpo/c-strcaseeq.h @@ -1,5 +1,5 @@ /* Optimized case-insensitive string comparison in C locale. - Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gettext-tools/libgettextpo/c-strncasecmp.c b/gettext-tools/libgettextpo/c-strncasecmp.c index b98e368..c316929 100644 --- a/gettext-tools/libgettextpo/c-strncasecmp.c +++ b/gettext-tools/libgettextpo/c-strncasecmp.c @@ -1,5 +1,5 @@ /* c-strncasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/c-strstr.c b/gettext-tools/libgettextpo/c-strstr.c index c8bebe6..eda7610 100644 --- a/gettext-tools/libgettextpo/c-strstr.c +++ b/gettext-tools/libgettextpo/c-strstr.c @@ -1,5 +1,5 @@ /* c-strstr.c -- substring search in C locale - Copyright (C) 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2005-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2005, 2007. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/c-strstr.h b/gettext-tools/libgettextpo/c-strstr.h index 4d44197..fec74a7 100644 --- a/gettext-tools/libgettextpo/c-strstr.h +++ b/gettext-tools/libgettextpo/c-strstr.h @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2001-2003, 2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/close.c b/gettext-tools/libgettextpo/close.c index 54d1f71..46a7aa5 100644 --- a/gettext-tools/libgettextpo/close.c +++ b/gettext-tools/libgettextpo/close.c @@ -1,5 +1,5 @@ /* close replacement. - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/concat-filename.c b/gettext-tools/libgettextpo/concat-filename.c index 1c4e77a..8fff22d 100644 --- a/gettext-tools/libgettextpo/concat-filename.c +++ b/gettext-tools/libgettextpo/concat-filename.c @@ -1,5 +1,5 @@ /* Construct a full filename from a directory and a relative filename. - Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/gettext-tools/libgettextpo/concat-filename.h b/gettext-tools/libgettextpo/concat-filename.h index e308744..08f6b40 100644 --- a/gettext-tools/libgettextpo/concat-filename.h +++ b/gettext-tools/libgettextpo/concat-filename.h @@ -1,5 +1,5 @@ /* Construct a full filename from a directory and a relative filename. - Copyright (C) 2001-2004, 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2007-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/config.charset b/gettext-tools/libgettextpo/config.charset index f06d7e9..947d916 100644 --- a/gettext-tools/libgettextpo/config.charset +++ b/gettext-tools/libgettextpo/config.charset @@ -1,7 +1,7 @@ #! /bin/sh # Output a system dependent table of character encoding aliases. # -# Copyright (C) 2000-2004, 2006-2015 Free Software Foundation, Inc. +# Copyright (C) 2000-2004, 2006-2016 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/diffseq.h b/gettext-tools/libgettextpo/diffseq.h index 2a02651..35bcd56 100644 --- a/gettext-tools/libgettextpo/diffseq.h +++ b/gettext-tools/libgettextpo/diffseq.h @@ -1,6 +1,6 @@ /* Analyze differences between two vectors. - Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2015 Free Software + Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/dosname.h b/gettext-tools/libgettextpo/dosname.h index 893baf6..83a953f 100644 --- a/gettext-tools/libgettextpo/dosname.h +++ b/gettext-tools/libgettextpo/dosname.h @@ -1,6 +1,6 @@ /* File names on MS-DOS/Windows systems. - Copyright (C) 2000-2001, 2004-2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2004-2006, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/errno.in.h b/gettext-tools/libgettextpo/errno.in.h index affbb97..b8397ee 100644 --- a/gettext-tools/libgettextpo/errno.in.h +++ b/gettext-tools/libgettextpo/errno.in.h @@ -1,6 +1,6 @@ /* A POSIX-like <errno.h>. - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/error-progname.c b/gettext-tools/libgettextpo/error-progname.c index 525d11f..ba2702a 100644 --- a/gettext-tools/libgettextpo/error-progname.c +++ b/gettext-tools/libgettextpo/error-progname.c @@ -1,5 +1,5 @@ /* Use of program name in error-reporting functions. - Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/error-progname.h b/gettext-tools/libgettextpo/error-progname.h index f16107a..5b89b71 100644 --- a/gettext-tools/libgettextpo/error-progname.h +++ b/gettext-tools/libgettextpo/error-progname.h @@ -1,5 +1,5 @@ /* Use of program name in error-reporting functions. - Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/error.c b/gettext-tools/libgettextpo/error.c index 0ac7695..56ac889 100644 --- a/gettext-tools/libgettextpo/error.c +++ b/gettext-tools/libgettextpo/error.c @@ -1,5 +1,5 @@ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 2009-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/error.h b/gettext-tools/libgettextpo/error.h index c5b3736..a9c19cb 100644 --- a/gettext-tools/libgettextpo/error.h +++ b/gettext-tools/libgettextpo/error.h @@ -1,5 +1,5 @@ /* Declaration for error-reporting function - Copyright (C) 1995-1997, 2003, 2006, 2008-2015 Free Software Foundation, + Copyright (C) 1995-1997, 2003, 2006, 2008-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gettext-tools/libgettextpo/exitfail.c b/gettext-tools/libgettextpo/exitfail.c index 8035b89..8033c22 100644 --- a/gettext-tools/libgettextpo/exitfail.c +++ b/gettext-tools/libgettextpo/exitfail.c @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/exitfail.h b/gettext-tools/libgettextpo/exitfail.h index 5f09786..ef1e488 100644 --- a/gettext-tools/libgettextpo/exitfail.h +++ b/gettext-tools/libgettextpo/exitfail.h @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/exported.sh.in b/gettext-tools/libgettextpo/exported.sh.in index 4d5a3a4..69374e5 100644 --- a/gettext-tools/libgettextpo/exported.sh.in +++ b/gettext-tools/libgettextpo/exported.sh.in @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2006, 2015 Free Software Foundation, Inc. +# Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/fcntl.in.h b/gettext-tools/libgettextpo/fcntl.in.h index e288018..b943973 100644 --- a/gettext-tools/libgettextpo/fcntl.in.h +++ b/gettext-tools/libgettextpo/fcntl.in.h @@ -1,6 +1,6 @@ /* Like <fcntl.h>, but with non-working flags defined to 0. - Copyright (C) 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2006-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/fd-hook.c b/gettext-tools/libgettextpo/fd-hook.c index b1488c4..8676c6b 100644 --- a/gettext-tools/libgettextpo/fd-hook.c +++ b/gettext-tools/libgettextpo/fd-hook.c @@ -1,5 +1,5 @@ /* Hook for making making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/fd-hook.h b/gettext-tools/libgettextpo/fd-hook.h index bdb9aef..9568d07 100644 --- a/gettext-tools/libgettextpo/fd-hook.h +++ b/gettext-tools/libgettextpo/fd-hook.h @@ -1,5 +1,5 @@ /* Hook for making making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gettext-tools/libgettextpo/file-ostream.c b/gettext-tools/libgettextpo/file-ostream.c index b299429..73498cb 100644 --- a/gettext-tools/libgettextpo/file-ostream.c +++ b/gettext-tools/libgettextpo/file-ostream.c @@ -2,7 +2,7 @@ #line 1 "file-ostream.oo.c" /* Output stream referring to an stdio FILE. - Copyright (C) 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/file-ostream.h b/gettext-tools/libgettextpo/file-ostream.h index f156871..918e8c9 100644 --- a/gettext-tools/libgettextpo/file-ostream.h +++ b/gettext-tools/libgettextpo/file-ostream.h @@ -2,7 +2,7 @@ #line 1 "file-ostream.oo.h" /* Output stream referring to an stdio FILE. - Copyright (C) 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/file-ostream.oo.c b/gettext-tools/libgettextpo/file-ostream.oo.c index a500825..0b19942 100644 --- a/gettext-tools/libgettextpo/file-ostream.oo.c +++ b/gettext-tools/libgettextpo/file-ostream.oo.c @@ -1,5 +1,5 @@ /* Output stream referring to an stdio FILE. - Copyright (C) 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/file-ostream.oo.h b/gettext-tools/libgettextpo/file-ostream.oo.h index 395cef7..8b4fd8b 100644 --- a/gettext-tools/libgettextpo/file-ostream.oo.h +++ b/gettext-tools/libgettextpo/file-ostream.oo.h @@ -1,5 +1,5 @@ /* Output stream referring to an stdio FILE. - Copyright (C) 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/filename.h b/gettext-tools/libgettextpo/filename.h index 4576993..7d2c31a 100644 --- a/gettext-tools/libgettextpo/filename.h +++ b/gettext-tools/libgettextpo/filename.h @@ -1,5 +1,5 @@ /* Basic filename support macros. - Copyright (C) 2001-2004, 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2007-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/float+.h b/gettext-tools/libgettextpo/float+.h index e6aaa92..00fcc76 100644 --- a/gettext-tools/libgettextpo/float+.h +++ b/gettext-tools/libgettextpo/float+.h @@ -1,5 +1,5 @@ /* Supplemental information about the floating-point formats. - Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2007. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/float.c b/gettext-tools/libgettextpo/float.c index dac9f88..1bad2ee 100644 --- a/gettext-tools/libgettextpo/float.c +++ b/gettext-tools/libgettextpo/float.c @@ -1,5 +1,5 @@ /* Auxiliary definitions for <float.h>. - Copyright (C) 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2011-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/float.in.h b/gettext-tools/libgettextpo/float.in.h index 3bb3826..0b93d90 100644 --- a/gettext-tools/libgettextpo/float.in.h +++ b/gettext-tools/libgettextpo/float.in.h @@ -1,6 +1,6 @@ /* A correct <float.h>. - Copyright (C) 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2007-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/fopen.c b/gettext-tools/libgettextpo/fopen.c index 139ede2..6c0c847 100644 --- a/gettext-tools/libgettextpo/fopen.c +++ b/gettext-tools/libgettextpo/fopen.c @@ -1,5 +1,5 @@ /* Open a stream to a file. - Copyright (C) 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2007-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/fstat.c b/gettext-tools/libgettextpo/fstat.c index 7a0521f..435c429 100644 --- a/gettext-tools/libgettextpo/fstat.c +++ b/gettext-tools/libgettextpo/fstat.c @@ -1,5 +1,5 @@ /* fstat() replacement. - Copyright (C) 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2011-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/fstrcmp.c b/gettext-tools/libgettextpo/fstrcmp.c index d40e6ef..a12f2b5 100644 --- a/gettext-tools/libgettextpo/fstrcmp.c +++ b/gettext-tools/libgettextpo/fstrcmp.c @@ -1,5 +1,5 @@ /* Functions to make fuzzy comparisons between strings - Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008-2015 Free + Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/fstrcmp.h b/gettext-tools/libgettextpo/fstrcmp.h index b2a240f..0a6daeb 100644 --- a/gettext-tools/libgettextpo/fstrcmp.h +++ b/gettext-tools/libgettextpo/fstrcmp.h @@ -1,5 +1,5 @@ /* Fuzzy string comparison. - Copyright (C) 1995, 2000, 2002-2003, 2006, 2008-2015 Free Software + Copyright (C) 1995, 2000, 2002-2003, 2006, 2008-2016 Free Software Foundation, Inc. This file was written by Peter Miller <pmiller@agso.gov.au> diff --git a/gettext-tools/libgettextpo/fwriteerror.c b/gettext-tools/libgettextpo/fwriteerror.c index 8e7c3ea..3581975 100644 --- a/gettext-tools/libgettextpo/fwriteerror.c +++ b/gettext-tools/libgettextpo/fwriteerror.c @@ -1,5 +1,5 @@ /* Detect write error on a stream. - Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2006, 2008-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/fwriteerror.h b/gettext-tools/libgettextpo/fwriteerror.h index 438f453..af548da 100644 --- a/gettext-tools/libgettextpo/fwriteerror.h +++ b/gettext-tools/libgettextpo/fwriteerror.h @@ -1,5 +1,5 @@ /* Detect write error on a stream. - Copyright (C) 2003, 2005-2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2003, 2005-2006, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/gcd.c b/gettext-tools/libgettextpo/gcd.c index 414005e..effaeb1 100644 --- a/gettext-tools/libgettextpo/gcd.c +++ b/gettext-tools/libgettextpo/gcd.c @@ -1,5 +1,5 @@ /* Arithmetic. - Copyright (C) 2001-2002, 2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/gcd.h b/gettext-tools/libgettextpo/gcd.h index 56ce191..4368d98 100644 --- a/gettext-tools/libgettextpo/gcd.h +++ b/gettext-tools/libgettextpo/gcd.h @@ -1,5 +1,5 @@ /* Arithmetic. - Copyright (C) 2001-2002, 2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/getdelim.c b/gettext-tools/libgettextpo/getdelim.c index 88258e5..e316c91 100644 --- a/gettext-tools/libgettextpo/getdelim.c +++ b/gettext-tools/libgettextpo/getdelim.c @@ -1,5 +1,5 @@ /* getdelim.c --- Implementation of replacement getdelim function. - Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2015 Free Software + Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or diff --git a/gettext-tools/libgettextpo/getline.c b/gettext-tools/libgettextpo/getline.c index 811c773..dfc679a 100644 --- a/gettext-tools/libgettextpo/getline.c +++ b/gettext-tools/libgettextpo/getline.c @@ -1,5 +1,5 @@ /* getline.c --- Implementation of replacement getline function. - Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/gettext-tools/libgettextpo/gettext-po.c b/gettext-tools/libgettextpo/gettext-po.c index ddcddd1..281d286 100644 --- a/gettext-tools/libgettextpo/gettext-po.c +++ b/gettext-tools/libgettextpo/gettext-po.c @@ -1,5 +1,5 @@ /* Public API for GNU gettext PO files. - Copyright (C) 2003-2010, 2015 Free Software Foundation, Inc. + Copyright (C) 2003-2010, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/gettext-po.in.h b/gettext-tools/libgettextpo/gettext-po.in.h index 62898d5..a42ae22 100644 --- a/gettext-tools/libgettextpo/gettext-po.in.h +++ b/gettext-tools/libgettextpo/gettext-po.in.h @@ -1,5 +1,5 @@ /* Public API for GNU gettext PO files - contained in libgettextpo. - Copyright (C) 2003-2008, 2010, 2015 Free Software Foundation, Inc. + Copyright (C) 2003-2008, 2010, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify @@ -28,7 +28,7 @@ extern "C" { /* =========================== Meta Information ============================ */ /* Version number: (major<<16) + (minor<<8) + subminor */ -#define LIBGETTEXTPO_VERSION 0x001307 +#define LIBGETTEXTPO_VERSION 0x001308 extern int libgettextpo_version; /* ================================= Types ================================= */ diff --git a/gettext-tools/libgettextpo/gettext.h b/gettext-tools/libgettextpo/gettext.h index f37d586..841b072 100644 --- a/gettext-tools/libgettextpo/gettext.h +++ b/gettext-tools/libgettextpo/gettext.h @@ -1,6 +1,6 @@ /* Convenience header for conditional use of GNU <libintl.h>. - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011, 2015 Free - Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2016 Free Software + Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -225,15 +225,17 @@ dcpgettext_expr (const char *domain, if (msg_ctxt_id != NULL) #endif { + int found_translation; memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); msg_ctxt_id[msgctxt_len - 1] = '\004'; memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); translation = dcgettext (domain, msg_ctxt_id, category); + found_translation = (translation != msg_ctxt_id); #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS if (msg_ctxt_id != buf) free (msg_ctxt_id); #endif - if (translation != msg_ctxt_id) + if (found_translation) return translation; } return msgid; @@ -271,15 +273,17 @@ dcnpgettext_expr (const char *domain, if (msg_ctxt_id != NULL) #endif { + int found_translation; memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); msg_ctxt_id[msgctxt_len - 1] = '\004'; memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); + found_translation = !(translation == msg_ctxt_id || translation == msgid_plural); #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS if (msg_ctxt_id != buf) free (msg_ctxt_id); #endif - if (!(translation == msg_ctxt_id || translation == msgid_plural)) + if (found_translation) return translation; } return (n == 1 ? msgid : msgid_plural); diff --git a/gettext-tools/libgettextpo/gettimeofday.c b/gettext-tools/libgettextpo/gettimeofday.c index e0e2e69..224ca6a 100644 --- a/gettext-tools/libgettextpo/gettimeofday.c +++ b/gettext-tools/libgettextpo/gettimeofday.c @@ -1,6 +1,6 @@ /* Provide gettimeofday for systems that don't have it or for which it's broken. - Copyright (C) 2001-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/gl_anylinked_list1.h b/gettext-tools/libgettextpo/gl_anylinked_list1.h index aa336e3..dcb66ec 100644 --- a/gettext-tools/libgettextpo/gl_anylinked_list1.h +++ b/gettext-tools/libgettextpo/gl_anylinked_list1.h @@ -1,5 +1,5 @@ /* Sequential list data type implemented by a linked list. - Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/gl_anylinked_list2.h b/gettext-tools/libgettextpo/gl_anylinked_list2.h index 5ba2806..6250c2b 100644 --- a/gettext-tools/libgettextpo/gl_anylinked_list2.h +++ b/gettext-tools/libgettextpo/gl_anylinked_list2.h @@ -1,5 +1,5 @@ /* Sequential list data type implemented by a linked list. - Copyright (C) 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/gl_linked_list.c b/gettext-tools/libgettextpo/gl_linked_list.c index b83e164..459880f 100644 --- a/gettext-tools/libgettextpo/gl_linked_list.c +++ b/gettext-tools/libgettextpo/gl_linked_list.c @@ -1,5 +1,5 @@ /* Sequential list data type implemented by a linked list. - Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/gl_linked_list.h b/gettext-tools/libgettextpo/gl_linked_list.h index a7b7eec..4b16c83 100644 --- a/gettext-tools/libgettextpo/gl_linked_list.h +++ b/gettext-tools/libgettextpo/gl_linked_list.h @@ -1,5 +1,5 @@ /* Sequential list data type implemented by a linked list. - Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/gl_list.h b/gettext-tools/libgettextpo/gl_list.h index a0c7d27..c9d05b0 100644 --- a/gettext-tools/libgettextpo/gl_list.h +++ b/gettext-tools/libgettextpo/gl_list.h @@ -1,5 +1,5 @@ /* Abstract sequential list data type. -*- coding: utf-8 -*- - Copyright (C) 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/gl_xlist.h b/gettext-tools/libgettextpo/gl_xlist.h index 7ea62c1..06824fc 100644 --- a/gettext-tools/libgettextpo/gl_xlist.h +++ b/gettext-tools/libgettextpo/gl_xlist.h @@ -1,5 +1,5 @@ /* Abstract sequential list data type, with out-of-memory checking. - Copyright (C) 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/glthread/lock.c b/gettext-tools/libgettextpo/glthread/lock.c index b64132a..935043b 100644 --- a/gettext-tools/libgettextpo/glthread/lock.c +++ b/gettext-tools/libgettextpo/glthread/lock.c @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2005-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/glthread/lock.h b/gettext-tools/libgettextpo/glthread/lock.h index cf3d0d9..e64506b 100644 --- a/gettext-tools/libgettextpo/glthread/lock.h +++ b/gettext-tools/libgettextpo/glthread/lock.h @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2005-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/glthread/threadlib.c b/gettext-tools/libgettextpo/glthread/threadlib.c index f01d351..be63713 100644 --- a/gettext-tools/libgettextpo/glthread/threadlib.c +++ b/gettext-tools/libgettextpo/glthread/threadlib.c @@ -1,5 +1,5 @@ /* Multithreading primitives. - Copyright (C) 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2005-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/glthread/tls.c b/gettext-tools/libgettextpo/glthread/tls.c index f1c0cd7..7c1916a 100644 --- a/gettext-tools/libgettextpo/glthread/tls.c +++ b/gettext-tools/libgettextpo/glthread/tls.c @@ -1,5 +1,5 @@ /* Thread-local storage in multithreaded situations. - Copyright (C) 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2005-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/glthread/tls.h b/gettext-tools/libgettextpo/glthread/tls.h index cf53a2b..63955a2 100644 --- a/gettext-tools/libgettextpo/glthread/tls.h +++ b/gettext-tools/libgettextpo/glthread/tls.h @@ -1,5 +1,5 @@ /* Thread-local storage in multithreaded situations. - Copyright (C) 2005, 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2005, 2007-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4 b/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4 index df20907..c4c50e3 100644 --- a/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4 +++ b/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 b/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 index 2638835..061075b 100644 --- a/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 +++ b/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -77,6 +77,7 @@ AC_DEFUN([gtpo_EARLY], # Code from module gettext-h: # Code from module gettimeofday: # Code from module gperf: + # Code from module hard-locale: # Code from module hash: # Code from module havelib: # Code from module iconv: @@ -270,6 +271,7 @@ AC_DEFUN([gtpo_INIT], gl_PREREQ_GETTIMEOFDAY fi gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) + gl_HARD_LOCALE AM_ICONV m4_ifdef([gl_ICONV_MODULE_INDICATOR], [gl_ICONV_MODULE_INDICATOR([iconv])]) @@ -317,11 +319,11 @@ AC_DEFUN([gtpo_INIT], gl_STRING_MODULE_INDICATOR([memchr]) gl_MINMAX gl_MOO - gl_MSVC_INVAL + AC_REQUIRE([gl_MSVC_INVAL]) if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then AC_LIBOBJ([msvc-inval]) fi - gl_MSVC_NOTHROW + AC_REQUIRE([gl_MSVC_NOTHROW]) if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then AC_LIBOBJ([msvc-nothrow]) fi @@ -704,6 +706,8 @@ AC_DEFUN([gtpo_FILE_LIST], [ lib/glthread/threadlib.c lib/glthread/tls.c lib/glthread/tls.h + lib/hard-locale.c + lib/hard-locale.h lib/hash.c lib/hash.h lib/iconv.c @@ -877,6 +881,7 @@ AC_DEFUN([gtpo_FILE_LIST], [ m4/gettimeofday.m4 m4/glibc21.m4 m4/gnulib-common.m4 + m4/hard-locale.m4 m4/iconv.m4 m4/iconv_h.m4 m4/iconv_open.m4 diff --git a/gettext-tools/libgettextpo/hard-locale.c b/gettext-tools/libgettextpo/hard-locale.c new file mode 100644 index 0000000..c7d9da5 --- /dev/null +++ b/gettext-tools/libgettextpo/hard-locale.c @@ -0,0 +1,72 @@ +/* hard-locale.c -- Determine whether a locale is hard. + + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2016 Free Software + Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <config.h> + +#include "hard-locale.h" + +#include <locale.h> +#include <stdlib.h> +#include <string.h> + +#ifdef __GLIBC__ +# define GLIBC_VERSION __GLIBC__ +#elif defined __UCLIBC__ +# define GLIBC_VERSION 2 +#else +# define GLIBC_VERSION 0 +#endif + +/* Return true if the current CATEGORY locale is hard, i.e. if you + can't get away with assuming traditional C or POSIX behavior. */ +bool +hard_locale (int category) +{ + bool hard = true; + char const *p = setlocale (category, NULL); + + if (p) + { + if (2 <= GLIBC_VERSION) + { + if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0) + hard = false; + } + else + { + char *locale = strdup (p); + if (locale) + { + /* Temporarily set the locale to the "C" and "POSIX" locales + to find their names, so that we can determine whether one + or the other is the caller's locale. */ + if (((p = setlocale (category, "C")) + && strcmp (p, locale) == 0) + || ((p = setlocale (category, "POSIX")) + && strcmp (p, locale) == 0)) + hard = false; + + /* Restore the caller's locale. */ + setlocale (category, locale); + free (locale); + } + } + } + + return hard; +} diff --git a/gettext-tools/libgettextpo/hard-locale.h b/gettext-tools/libgettextpo/hard-locale.h new file mode 100644 index 0000000..7644afa --- /dev/null +++ b/gettext-tools/libgettextpo/hard-locale.h @@ -0,0 +1,25 @@ +/* Determine whether a locale is hard. + + Copyright (C) 1999, 2003-2004, 2009-2016 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef HARD_LOCALE_H_ +# define HARD_LOCALE_H_ 1 + +# include <stdbool.h> + +bool hard_locale (int); + +#endif /* HARD_LOCALE_H_ */ diff --git a/gettext-tools/libgettextpo/hash.c b/gettext-tools/libgettextpo/hash.c index 89fa5ec..4202f79 100644 --- a/gettext-tools/libgettextpo/hash.c +++ b/gettext-tools/libgettextpo/hash.c @@ -1,6 +1,5 @@ /* hash - implement simple hashing table with string based keys. - Copyright (C) 1994-1995, 2000-2006, 2015 Free Software Foundation, - Inc. + Copyright (C) 1994-1995, 2000-2006, 2015-2016 Free Software Foundation, Inc. Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, October 1994. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/hash.h b/gettext-tools/libgettextpo/hash.h index b98e340..61c0397 100644 --- a/gettext-tools/libgettextpo/hash.h +++ b/gettext-tools/libgettextpo/hash.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 2000-2003, 2005-2006, 2015 Free Software +/* Copyright (C) 1995, 2000-2003, 2005-2006, 2015-2016 Free Software * Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/iconv.c b/gettext-tools/libgettextpo/iconv.c index 28c13c5..9ce9c01 100644 --- a/gettext-tools/libgettextpo/iconv.c +++ b/gettext-tools/libgettextpo/iconv.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 1999-2001, 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2007, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/iconv.in.h b/gettext-tools/libgettextpo/iconv.in.h index 94ab806..cb1da14 100644 --- a/gettext-tools/libgettextpo/iconv.in.h +++ b/gettext-tools/libgettextpo/iconv.in.h @@ -1,6 +1,6 @@ /* A GNU-like <iconv.h>. - Copyright (C) 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2007-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/iconv_close.c b/gettext-tools/libgettextpo/iconv_close.c index 59e0aca..d1cd793 100644 --- a/gettext-tools/libgettextpo/iconv_close.c +++ b/gettext-tools/libgettextpo/iconv_close.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/iconv_open.c b/gettext-tools/libgettextpo/iconv_open.c index 09d042d..d5c5a52 100644 --- a/gettext-tools/libgettextpo/iconv_open.c +++ b/gettext-tools/libgettextpo/iconv_open.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/iconveh.h b/gettext-tools/libgettextpo/iconveh.h index 118e29c..1849c39 100644 --- a/gettext-tools/libgettextpo/iconveh.h +++ b/gettext-tools/libgettextpo/iconveh.h @@ -1,5 +1,5 @@ /* Character set conversion handler type. - Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/intprops.h b/gettext-tools/libgettextpo/intprops.h index ecafaf7..3152139 100644 --- a/gettext-tools/libgettextpo/intprops.h +++ b/gettext-tools/libgettextpo/intprops.h @@ -1,10 +1,10 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2005, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2016 Free Software Foundation, Inc. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -21,6 +21,7 @@ #define _GL_INTPROPS_H #include <limits.h> +#include <verify.h> /* Return a value with the common real type of E and V and the value of V. */ #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) @@ -36,17 +37,6 @@ an integer. */ #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1) -/* True if negative values of the signed integer type T use two's - complement, ones' complement, or signed magnitude representation, - respectively. Much GNU code assumes two's complement, but some - people like to be portable to all possible C hosts. */ -#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1) -#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0) -#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1) - -/* True if the signed integer expression E uses two's complement. */ -#define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1) - /* True if the real type T is signed. */ #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) @@ -55,18 +45,10 @@ #define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) -/* Minimum and maximum values for integer types and expressions. These - macros have undefined behavior if T is signed and has padding bits. - If this is a problem for you, please let us know how to fix it for - your host. */ +/* Minimum and maximum values for integer types and expressions. */ /* The maximum and minimum values for the integer type T. */ -#define TYPE_MINIMUM(t) \ - ((t) (! TYPE_SIGNED (t) \ - ? (t) 0 \ - : TYPE_SIGNED_MAGNITUDE (t) \ - ? ~ (t) 0 \ - : ~ TYPE_MAXIMUM (t))) +#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) #define TYPE_MAXIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) -1 \ @@ -76,7 +58,7 @@ after integer promotion. E should not have side effects. */ #define _GL_INT_MINIMUM(e) \ (EXPR_SIGNED (e) \ - ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e) \ + ? ~ _GL_SIGNED_INT_MAXIMUM (e) \ : _GL_INT_CONVERT (e, 0)) #define _GL_INT_MAXIMUM(e) \ (EXPR_SIGNED (e) \ @@ -85,8 +67,25 @@ #define _GL_SIGNED_INT_MAXIMUM(e) \ (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) +/* This include file assumes that signed types are two's complement without + padding bits; the above macros have undefined behavior otherwise. + If this is a problem for you, please let us know how to fix it for your host. + As a sanity check, test the assumption for some signed types that + <limits.h> bounds. */ +verify (TYPE_MINIMUM (signed char) == SCHAR_MIN); +verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX); +verify (TYPE_MINIMUM (short int) == SHRT_MIN); +verify (TYPE_MAXIMUM (short int) == SHRT_MAX); +verify (TYPE_MINIMUM (int) == INT_MIN); +verify (TYPE_MAXIMUM (int) == INT_MAX); +verify (TYPE_MINIMUM (long int) == LONG_MIN); +verify (TYPE_MAXIMUM (long int) == LONG_MAX); +#ifdef LLONG_MAX +verify (TYPE_MINIMUM (long long int) == LLONG_MIN); +verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); +#endif -/* Return 1 if the __typeof__ keyword works. This could be done by +/* Does the __typeof__ keyword work? This could be done by 'configure', but for now it's easier to do it by hand. */ #if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ || (0x5110 <= __SUNPRO_C && !__STDC__)) diff --git a/gettext-tools/libgettextpo/itold.c b/gettext-tools/libgettextpo/itold.c index 1eee03e..5533392 100644 --- a/gettext-tools/libgettextpo/itold.c +++ b/gettext-tools/libgettextpo/itold.c @@ -1,5 +1,5 @@ /* Replacement for 'int' to 'long double' conversion routine. - Copyright (C) 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2011-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/libgettextpo.rc b/gettext-tools/libgettextpo/libgettextpo.rc index e12d6da..83ff2a1 100644 --- a/gettext-tools/libgettextpo/libgettextpo.rc +++ b/gettext-tools/libgettextpo/libgettextpo.rc @@ -24,7 +24,7 @@ BEGIN VALUE "FileDescription", "GPLed libgettextpo for Windows NT/2000/XP/Vista/7 and Windows 95/98/ME\0" VALUE "FileVersion", PACKAGE_VERSION_STRING "\0" VALUE "InternalName", "gettextpo.dll\0" - VALUE "LegalCopyright", "Copyright (C) 1995-2010\0" + VALUE "LegalCopyright", "Copyright (C) 1995-2016\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "gettextpo.dll\0" VALUE "ProductName", "libgettextpo: public API for PO files\0" diff --git a/gettext-tools/libgettextpo/localcharset.c b/gettext-tools/libgettextpo/localcharset.c index 1f02aa5..b2a0369 100644 --- a/gettext-tools/libgettextpo/localcharset.c +++ b/gettext-tools/libgettextpo/localcharset.c @@ -1,6 +1,6 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2006, 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/localcharset.h b/gettext-tools/libgettextpo/localcharset.h index c5e6d46..915182e 100644 --- a/gettext-tools/libgettextpo/localcharset.h +++ b/gettext-tools/libgettextpo/localcharset.h @@ -1,5 +1,5 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2003, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2016 Free Software Foundation, Inc. This file is part of the GNU CHARSET Library. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/malloc.c b/gettext-tools/libgettextpo/malloc.c index 00800a2..e9b01d2 100644 --- a/gettext-tools/libgettextpo/malloc.c +++ b/gettext-tools/libgettextpo/malloc.c @@ -1,6 +1,6 @@ /* malloc() function that is glibc compatible. - Copyright (C) 1997-1998, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/malloca.c b/gettext-tools/libgettextpo/malloca.c index 198a96c..a613277 100644 --- a/gettext-tools/libgettextpo/malloca.c +++ b/gettext-tools/libgettextpo/malloca.c @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/malloca.h b/gettext-tools/libgettextpo/malloca.h index 7a4190c..fa27a9e 100644 --- a/gettext-tools/libgettextpo/malloca.h +++ b/gettext-tools/libgettextpo/malloca.h @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/markup.c b/gettext-tools/libgettextpo/markup.c index 74ba906..fc1cca3 100644 --- a/gettext-tools/libgettextpo/markup.c +++ b/gettext-tools/libgettextpo/markup.c @@ -1,5 +1,5 @@ /* markup.c -- simple XML-like parser - Copyright (C) 2015 Free Software Foundation, Inc. + Copyright (C) 2015-2016 Free Software Foundation, Inc. This file is not part of the GNU gettext program, but is used with GNU gettext. diff --git a/gettext-tools/libgettextpo/markup.h b/gettext-tools/libgettextpo/markup.h index 61e5b0e..c8b60a1 100644 --- a/gettext-tools/libgettextpo/markup.h +++ b/gettext-tools/libgettextpo/markup.h @@ -1,5 +1,5 @@ /* markup.h -- simple XML-like string parser - Copyright (C) 2015 Free Software Foundation, Inc. + Copyright (C) 2015-2016 Free Software Foundation, Inc. This file is not part of the GNU gettext program, but is used with GNU gettext. diff --git a/gettext-tools/libgettextpo/mbrtowc.c b/gettext-tools/libgettextpo/mbrtowc.c index e49d55b..cdd874b 100644 --- a/gettext-tools/libgettextpo/mbrtowc.c +++ b/gettext-tools/libgettextpo/mbrtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2015 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify @@ -20,6 +20,11 @@ /* Specification. */ #include <wchar.h> +#if C_LOCALE_MAYBE_EILSEQ +# include "hard-locale.h" +# include <locale.h> +#endif + #if GNULIB_defined_mbstate_t /* Implement mbrtowc() on top of mbtowc(). */ @@ -328,6 +333,9 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) size_t rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) { + size_t ret; + wchar_t wc; + # if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG if (s == NULL) { @@ -342,6 +350,9 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) return (size_t) -2; # endif + if (! pwc) + pwc = &wc; + # if MBRTOWC_RETVAL_BUG { static mbstate_t internal_state; @@ -357,8 +368,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) size_t count = 0; for (; n > 0; s++, n--) { - wchar_t wc; - size_t ret = mbrtowc (&wc, s, 1, ps); + ret = mbrtowc (&wc, s, 1, ps); if (ret == (size_t)(-1)) return (size_t)(-1); @@ -366,8 +376,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) if (ret != (size_t)(-2)) { /* The multibyte character has been completed. */ - if (pwc != NULL) - *pwc = wc; + *pwc = wc; return (wc == 0 ? 0 : count); } } @@ -376,32 +385,23 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) } # endif -# if MBRTOWC_NUL_RETVAL_BUG - { - wchar_t wc; - size_t ret = mbrtowc (&wc, s, n, ps); + ret = mbrtowc (pwc, s, n, ps); - if (ret != (size_t)(-1) && ret != (size_t)(-2)) - { - if (pwc != NULL) - *pwc = wc; - if (wc == 0) - ret = 0; - } - return ret; - } -# else - { -# if MBRTOWC_NULL_ARG1_BUG - wchar_t dummy; - - if (pwc == NULL) - pwc = &dummy; -# endif +# if MBRTOWC_NUL_RETVAL_BUG + if (ret < (size_t) -2 && !*pwc) + return 0; +# endif - return mbrtowc (pwc, s, n, ps); - } +# if C_LOCALE_MAYBE_EILSEQ + if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE)) + { + unsigned char uc = *s; + *pwc = uc; + return 1; + } # endif + + return ret; } #endif diff --git a/gettext-tools/libgettextpo/mbsinit.c b/gettext-tools/libgettextpo/mbsinit.c index 4effdd8..372b523 100644 --- a/gettext-tools/libgettextpo/mbsinit.c +++ b/gettext-tools/libgettextpo/mbsinit.c @@ -1,5 +1,5 @@ /* Test for initial conversion state. - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/mbswidth.c b/gettext-tools/libgettextpo/mbswidth.c index 75ca79a..a235bf1 100644 --- a/gettext-tools/libgettextpo/mbswidth.c +++ b/gettext-tools/libgettextpo/mbswidth.c @@ -1,5 +1,5 @@ /* Determine the number of screen columns needed for a string. - Copyright (C) 2000-2015 Free Software Foundation, Inc. + Copyright (C) 2000-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/mbswidth.h b/gettext-tools/libgettextpo/mbswidth.h index f5b0fc3..b04cfe4 100644 --- a/gettext-tools/libgettextpo/mbswidth.h +++ b/gettext-tools/libgettextpo/mbswidth.h @@ -1,5 +1,5 @@ /* Determine the number of screen columns needed for a string. - Copyright (C) 2000-2004, 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2000-2004, 2007, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/memchr.c b/gettext-tools/libgettextpo/memchr.c index f74cc9a..b565542 100644 --- a/gettext-tools/libgettextpo/memchr.c +++ b/gettext-tools/libgettextpo/memchr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2015 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2016 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), diff --git a/gettext-tools/libgettextpo/minmax.h b/gettext-tools/libgettextpo/minmax.h index 919678d..be6b321 100644 --- a/gettext-tools/libgettextpo/minmax.h +++ b/gettext-tools/libgettextpo/minmax.h @@ -1,5 +1,5 @@ /* MIN, MAX macros. - Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2015 Free Software + Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/moo.h b/gettext-tools/libgettextpo/moo.h index 2925b58..d9e6328 100644 --- a/gettext-tools/libgettextpo/moo.h +++ b/gettext-tools/libgettextpo/moo.h @@ -1,5 +1,5 @@ /* Minimal object-oriented facilities for C. - Copyright (C) 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/msvc-inval.c b/gettext-tools/libgettextpo/msvc-inval.c index a1f1dc0..baaf39e 100644 --- a/gettext-tools/libgettextpo/msvc-inval.c +++ b/gettext-tools/libgettextpo/msvc-inval.c @@ -1,5 +1,5 @@ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2011-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/msvc-inval.h b/gettext-tools/libgettextpo/msvc-inval.h index 8b07269..027c949 100644 --- a/gettext-tools/libgettextpo/msvc-inval.h +++ b/gettext-tools/libgettextpo/msvc-inval.h @@ -1,5 +1,5 @@ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2011-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/msvc-nothrow.c b/gettext-tools/libgettextpo/msvc-nothrow.c index 90cf801..ba75bbf 100644 --- a/gettext-tools/libgettextpo/msvc-nothrow.c +++ b/gettext-tools/libgettextpo/msvc-nothrow.c @@ -1,6 +1,6 @@ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2011-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/msvc-nothrow.h b/gettext-tools/libgettextpo/msvc-nothrow.h index 67b151e..3493b84 100644 --- a/gettext-tools/libgettextpo/msvc-nothrow.h +++ b/gettext-tools/libgettextpo/msvc-nothrow.h @@ -1,6 +1,6 @@ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2011-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/obstack.c b/gettext-tools/libgettextpo/obstack.c index dd6e1f7..24b67a5 100644 --- a/gettext-tools/libgettextpo/obstack.c +++ b/gettext-tools/libgettextpo/obstack.c @@ -1,5 +1,5 @@ /* obstack.c - subroutines used implicitly by object stack macros - Copyright (C) 1988-2015 Free Software Foundation, Inc. + Copyright (C) 1988-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/gettext-tools/libgettextpo/obstack.h b/gettext-tools/libgettextpo/obstack.h index f7e791b..1c25fbc 100644 --- a/gettext-tools/libgettextpo/obstack.h +++ b/gettext-tools/libgettextpo/obstack.h @@ -1,5 +1,5 @@ /* obstack.h - object stack macros - Copyright (C) 1988-2015 Free Software Foundation, Inc. + Copyright (C) 1988-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/gettext-tools/libgettextpo/open.c b/gettext-tools/libgettextpo/open.c index 95c7811..e9c3120 100644 --- a/gettext-tools/libgettextpo/open.c +++ b/gettext-tools/libgettextpo/open.c @@ -1,5 +1,5 @@ /* Open a descriptor to a file. - Copyright (C) 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2007-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/ostream.c b/gettext-tools/libgettextpo/ostream.c index 0cce0d2..380ef20 100644 --- a/gettext-tools/libgettextpo/ostream.c +++ b/gettext-tools/libgettextpo/ostream.c @@ -2,7 +2,7 @@ #line 1 "ostream.oo.c" /* Abstract output stream data type. - Copyright (C) 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/ostream.h b/gettext-tools/libgettextpo/ostream.h index 7fc6979..488b1de 100644 --- a/gettext-tools/libgettextpo/ostream.h +++ b/gettext-tools/libgettextpo/ostream.h @@ -2,7 +2,7 @@ #line 1 "ostream.oo.h" /* Abstract output stream data type. - Copyright (C) 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/ostream.oo.c b/gettext-tools/libgettextpo/ostream.oo.c index 3c178fa..443b03c 100644 --- a/gettext-tools/libgettextpo/ostream.oo.c +++ b/gettext-tools/libgettextpo/ostream.oo.c @@ -1,5 +1,5 @@ /* Abstract output stream data type. - Copyright (C) 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/ostream.oo.h b/gettext-tools/libgettextpo/ostream.oo.h index 87199df..d0882b9 100644 --- a/gettext-tools/libgettextpo/ostream.oo.h +++ b/gettext-tools/libgettextpo/ostream.oo.h @@ -1,5 +1,5 @@ /* Abstract output stream data type. - Copyright (C) 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/pathmax.h b/gettext-tools/libgettextpo/pathmax.h index 2f3b64f..aee22f8 100644 --- a/gettext-tools/libgettextpo/pathmax.h +++ b/gettext-tools/libgettextpo/pathmax.h @@ -1,5 +1,5 @@ /* Define PATH_MAX somehow. Requires sys/types.h. - Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2015 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/printf-args.c b/gettext-tools/libgettextpo/printf-args.c index da17efb..cfaed99 100644 --- a/gettext-tools/libgettextpo/printf-args.c +++ b/gettext-tools/libgettextpo/printf-args.c @@ -1,5 +1,5 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2015 Free Software + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/printf-args.h b/gettext-tools/libgettextpo/printf-args.h index 387976c..256c413 100644 --- a/gettext-tools/libgettextpo/printf-args.h +++ b/gettext-tools/libgettextpo/printf-args.h @@ -1,5 +1,5 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2015 Free Software + Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/printf-parse.c b/gettext-tools/libgettextpo/printf-parse.c index 40d0a22..fad5d3d 100644 --- a/gettext-tools/libgettextpo/printf-parse.c +++ b/gettext-tools/libgettextpo/printf-parse.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2003, 2006-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/printf-parse.h b/gettext-tools/libgettextpo/printf-parse.h index fda6704..a46d946 100644 --- a/gettext-tools/libgettextpo/printf-parse.h +++ b/gettext-tools/libgettextpo/printf-parse.h @@ -1,5 +1,5 @@ /* Parse printf format string. - Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2015 Free Software + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/progname.c b/gettext-tools/libgettextpo/progname.c index fe93bca..debb760 100644 --- a/gettext-tools/libgettextpo/progname.c +++ b/gettext-tools/libgettextpo/progname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/progname.h b/gettext-tools/libgettextpo/progname.h index 15ca3a2..526828f 100644 --- a/gettext-tools/libgettextpo/progname.h +++ b/gettext-tools/libgettextpo/progname.h @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/raise.c b/gettext-tools/libgettextpo/raise.c index d6ba2a1..bf24c3e 100644 --- a/gettext-tools/libgettextpo/raise.c +++ b/gettext-tools/libgettextpo/raise.c @@ -1,6 +1,6 @@ /* Provide a non-threads replacement for the POSIX raise function. - Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2006, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/rawmemchr.c b/gettext-tools/libgettextpo/rawmemchr.c index a6380ba..dbe01bd 100644 --- a/gettext-tools/libgettextpo/rawmemchr.c +++ b/gettext-tools/libgettextpo/rawmemchr.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/realloc.c b/gettext-tools/libgettextpo/realloc.c index 068b081..83cb44e 100644 --- a/gettext-tools/libgettextpo/realloc.c +++ b/gettext-tools/libgettextpo/realloc.c @@ -1,6 +1,6 @@ /* realloc() function that is glibc compatible. - Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2015 Free Software + Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/ref-add.sin b/gettext-tools/libgettextpo/ref-add.sin index 6cbe5b5..42d3ab0 100644 --- a/gettext-tools/libgettextpo/ref-add.sin +++ b/gettext-tools/libgettextpo/ref-add.sin @@ -1,6 +1,6 @@ # Add this package to a list of references stored in a text file. # -# Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/ref-del.sin b/gettext-tools/libgettextpo/ref-del.sin index f50cf0a..c77b33b 100644 --- a/gettext-tools/libgettextpo/ref-del.sin +++ b/gettext-tools/libgettextpo/ref-del.sin @@ -1,6 +1,6 @@ # Remove this package from a list of references stored in a text file. # -# Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/relocatable.c b/gettext-tools/libgettextpo/relocatable.c index bed882d..7a59595 100644 --- a/gettext-tools/libgettextpo/relocatable.c +++ b/gettext-tools/libgettextpo/relocatable.c @@ -1,5 +1,5 @@ /* Provide relocatable packages. - Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2006, 2008-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/relocatable.h b/gettext-tools/libgettextpo/relocatable.h index c8911b2..4081f22 100644 --- a/gettext-tools/libgettextpo/relocatable.h +++ b/gettext-tools/libgettextpo/relocatable.h @@ -1,5 +1,5 @@ /* Provide relocatable packages. - Copyright (C) 2003, 2005, 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2003, 2005, 2008-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/signal.in.h b/gettext-tools/libgettextpo/signal.in.h index 265b72a..ab0a049 100644 --- a/gettext-tools/libgettextpo/signal.in.h +++ b/gettext-tools/libgettextpo/signal.in.h @@ -1,6 +1,6 @@ /* A GNU-like <signal.h>. - Copyright (C) 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2006-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/sigprocmask.c b/gettext-tools/libgettextpo/sigprocmask.c index e29b012..fcbf032 100644 --- a/gettext-tools/libgettextpo/sigprocmask.c +++ b/gettext-tools/libgettextpo/sigprocmask.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking. - Copyright (C) 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/size_max.h b/gettext-tools/libgettextpo/size_max.h index 5a0568e..2f2792c 100644 --- a/gettext-tools/libgettextpo/size_max.h +++ b/gettext-tools/libgettextpo/size_max.h @@ -1,5 +1,5 @@ /* size_max.h -- declare SIZE_MAX through system headers - Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/stat.c b/gettext-tools/libgettextpo/stat.c index 2209826..62e9e0b 100644 --- a/gettext-tools/libgettextpo/stat.c +++ b/gettext-tools/libgettextpo/stat.c @@ -1,5 +1,5 @@ /* Work around platform bugs in stat. - Copyright (C) 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/stdarg.in.h b/gettext-tools/libgettextpo/stdarg.in.h index 5239f51..63371e2 100644 --- a/gettext-tools/libgettextpo/stdarg.in.h +++ b/gettext-tools/libgettextpo/stdarg.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <stdarg.h>. - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/stdbool.in.h b/gettext-tools/libgettextpo/stdbool.in.h index 64a1761..7ecf203 100644 --- a/gettext-tools/libgettextpo/stdbool.in.h +++ b/gettext-tools/libgettextpo/stdbool.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/stddef.in.h b/gettext-tools/libgettextpo/stddef.in.h index 698307b..f4c4a10 100644 --- a/gettext-tools/libgettextpo/stddef.in.h +++ b/gettext-tools/libgettextpo/stddef.in.h @@ -1,6 +1,6 @@ /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues. - Copyright (C) 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -81,8 +81,10 @@ # define wchar_t int #endif -/* Some platforms lack max_align_t. */ -#if !@HAVE_MAX_ALIGN_T@ +/* Some platforms lack max_align_t. The check for _GCC_MAX_ALIGN_T is + a hack in case the configure-time test was done with g++ even though + we are currently compiling with gcc. */ +#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T) /* On the x86, the maximum storage alignment of double, long, etc. is 4, but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8, and the C11 standard allows this. Work around this problem by diff --git a/gettext-tools/libgettextpo/stdint.in.h b/gettext-tools/libgettextpo/stdint.in.h index 378de2e..cf65ec6 100644 --- a/gettext-tools/libgettextpo/stdint.in.h +++ b/gettext-tools/libgettextpo/stdint.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004-2015 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2016 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -118,15 +118,10 @@ picky compilers. */ #define _STDINT_MIN(signed, bits, zero) \ - ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero)) + ((signed) ? ~ _STDINT_MAX (signed, bits, zero) : (zero)) #define _STDINT_MAX(signed, bits, zero) \ - ((signed) \ - ? ~ _STDINT_MIN (signed, bits, zero) \ - : /* The expression for the unsigned case. The subtraction of (signed) \ - is a nop in the unsigned case and avoids "signed integer overflow" \ - warnings in the signed case. */ \ - ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) + (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) #if !GNULIB_defined_stdint_types @@ -288,12 +283,17 @@ typedef gl_uint_fast32_t gl_uint_fast16_t; /* 7.18.1.4. Integer types capable of holding object pointers */ +/* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own + definitions of intptr_t and uintptr_t (which use int and unsigned) + to avoid clashes with declarations of system functions like sbrk. */ +#ifndef _INTPTR_T_DECLARED #undef intptr_t #undef uintptr_t typedef long int gl_intptr_t; typedef unsigned long int gl_uintptr_t; #define intptr_t gl_intptr_t #define uintptr_t gl_uintptr_t +#endif /* 7.18.1.5. Greatest-width integer types */ diff --git a/gettext-tools/libgettextpo/stdio-write.c b/gettext-tools/libgettextpo/stdio-write.c index b913101..072e55b 100644 --- a/gettext-tools/libgettextpo/stdio-write.c +++ b/gettext-tools/libgettextpo/stdio-write.c @@ -1,5 +1,5 @@ /* POSIX compatible FILE stream write function. - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/stdio.in.h b/gettext-tools/libgettextpo/stdio.in.h index ec43874..9b31365 100644 --- a/gettext-tools/libgettextpo/stdio.in.h +++ b/gettext-tools/libgettextpo/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdio.h>. - Copyright (C) 2004, 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/stdlib.in.h b/gettext-tools/libgettextpo/stdlib.in.h index 428a119..70dc88d 100644 --- a/gettext-tools/libgettextpo/stdlib.in.h +++ b/gettext-tools/libgettextpo/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdlib.h>. - Copyright (C) 1995, 2001-2004, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/stpcpy.c b/gettext-tools/libgettextpo/stpcpy.c index 559d2f2..ec3996e 100644 --- a/gettext-tools/libgettextpo/stpcpy.c +++ b/gettext-tools/libgettextpo/stpcpy.c @@ -1,5 +1,5 @@ /* stpcpy.c -- copy a string and return pointer to end of new string - Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2015 Free Software + Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2016 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/gettext-tools/libgettextpo/stpncpy.c b/gettext-tools/libgettextpo/stpncpy.c index e72ea47..89d6321 100644 --- a/gettext-tools/libgettextpo/stpncpy.c +++ b/gettext-tools/libgettextpo/stpncpy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2015 Free Software +/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2016 Free Software * Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/gettext-tools/libgettextpo/str-two-way.h b/gettext-tools/libgettextpo/str-two-way.h index 6e10c8e..0fe3161 100644 --- a/gettext-tools/libgettextpo/str-two-way.h +++ b/gettext-tools/libgettextpo/str-two-way.h @@ -1,5 +1,5 @@ /* Byte-wise substring search, using the Two-Way algorithm. - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Eric Blake <ebb9@byu.net>, 2008. diff --git a/gettext-tools/libgettextpo/strchrnul.c b/gettext-tools/libgettextpo/strchrnul.c index 1000e83..1482a77 100644 --- a/gettext-tools/libgettextpo/strchrnul.c +++ b/gettext-tools/libgettextpo/strchrnul.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/streq.h b/gettext-tools/libgettextpo/streq.h index 6107fc6..234f075 100644 --- a/gettext-tools/libgettextpo/streq.h +++ b/gettext-tools/libgettextpo/streq.h @@ -1,5 +1,5 @@ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gettext-tools/libgettextpo/strerror-override.c b/gettext-tools/libgettextpo/strerror-override.c index 2bb4d74..9bc9b18 100644 --- a/gettext-tools/libgettextpo/strerror-override.c +++ b/gettext-tools/libgettextpo/strerror-override.c @@ -1,6 +1,6 @@ /* strerror-override.c --- POSIX compatible system error routine - Copyright (C) 2010-2015 Free Software Foundation, Inc. + Copyright (C) 2010-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/strerror-override.h b/gettext-tools/libgettextpo/strerror-override.h index 7af36df..5264fd5 100644 --- a/gettext-tools/libgettextpo/strerror-override.h +++ b/gettext-tools/libgettextpo/strerror-override.h @@ -1,6 +1,6 @@ /* strerror-override.h --- POSIX compatible system error routine - Copyright (C) 2010-2015 Free Software Foundation, Inc. + Copyright (C) 2010-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/strerror.c b/gettext-tools/libgettextpo/strerror.c index adba738..45c7633 100644 --- a/gettext-tools/libgettextpo/strerror.c +++ b/gettext-tools/libgettextpo/strerror.c @@ -1,6 +1,6 @@ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2007-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/striconv.c b/gettext-tools/libgettextpo/striconv.c index 6f7dad8..0d9ccdc 100644 --- a/gettext-tools/libgettextpo/striconv.c +++ b/gettext-tools/libgettextpo/striconv.c @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2007, 2010-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2010-2016 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/striconv.h b/gettext-tools/libgettextpo/striconv.h index 33cc212..e5217d7 100644 --- a/gettext-tools/libgettextpo/striconv.h +++ b/gettext-tools/libgettextpo/striconv.h @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/striconveh.c b/gettext-tools/libgettextpo/striconveh.c index 2a9a8f7..bc5608f 100644 --- a/gettext-tools/libgettextpo/striconveh.c +++ b/gettext-tools/libgettextpo/striconveh.c @@ -1,5 +1,5 @@ /* Character set conversion with error handling. - Copyright (C) 2001-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2016 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/striconveh.h b/gettext-tools/libgettextpo/striconveh.h index 1e13af6..9e05d2f 100644 --- a/gettext-tools/libgettextpo/striconveh.h +++ b/gettext-tools/libgettextpo/striconveh.h @@ -1,5 +1,5 @@ /* Character set conversion with error handling. - Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/striconveha.c b/gettext-tools/libgettextpo/striconveha.c index 4fadc17..d97de1b 100644 --- a/gettext-tools/libgettextpo/striconveha.c +++ b/gettext-tools/libgettextpo/striconveha.c @@ -1,5 +1,5 @@ /* Character set conversion with error handling and autodetection. - Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/striconveha.h b/gettext-tools/libgettextpo/striconveha.h index a5b8824..73d1c9a 100644 --- a/gettext-tools/libgettextpo/striconveha.h +++ b/gettext-tools/libgettextpo/striconveha.h @@ -1,5 +1,5 @@ /* Character set conversion with error handling and autodetection. - Copyright (C) 2002, 2005, 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2007-2016 Free Software Foundation, Inc. Written by Bruno Haible. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/string.in.h b/gettext-tools/libgettextpo/string.in.h index 2abd6bc..7fb00c1 100644 --- a/gettext-tools/libgettextpo/string.in.h +++ b/gettext-tools/libgettextpo/string.in.h @@ -1,6 +1,6 @@ /* A GNU-like <string.h>. - Copyright (C) 1995-1996, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/strstr.c b/gettext-tools/libgettextpo/strstr.c index fbc11a2..60cd3e3 100644 --- a/gettext-tools/libgettextpo/strstr.c +++ b/gettext-tools/libgettextpo/strstr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2015 Free Software +/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gettext-tools/libgettextpo/sys_stat.in.h b/gettext-tools/libgettextpo/sys_stat.in.h index 9f5e853..72d9537 100644 --- a/gettext-tools/libgettextpo/sys_stat.in.h +++ b/gettext-tools/libgettextpo/sys_stat.in.h @@ -1,5 +1,5 @@ /* Provide a more complete sys/stat header file. - Copyright (C) 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2005-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/sys_time.in.h b/gettext-tools/libgettextpo/sys_time.in.h index c556c5d..1623a1d 100644 --- a/gettext-tools/libgettextpo/sys_time.in.h +++ b/gettext-tools/libgettextpo/sys_time.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/time.h. - Copyright (C) 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2007-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/sys_types.in.h b/gettext-tools/libgettextpo/sys_types.in.h index 814bc17..8ab0545 100644 --- a/gettext-tools/libgettextpo/sys_types.in.h +++ b/gettext-tools/libgettextpo/sys_types.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/types.h. - Copyright (C) 2011-2015 Free Software Foundation, Inc. + Copyright (C) 2011-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/time.in.h b/gettext-tools/libgettextpo/time.in.h index a90552c..865c114 100644 --- a/gettext-tools/libgettextpo/time.in.h +++ b/gettext-tools/libgettextpo/time.in.h @@ -1,6 +1,6 @@ /* A more-standard <time.h>. - Copyright (C) 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2007-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/uniconv.in.h b/gettext-tools/libgettextpo/uniconv.in.h index bca94ba..7c3b0c3 100644 --- a/gettext-tools/libgettextpo/uniconv.in.h +++ b/gettext-tools/libgettextpo/uniconv.in.h @@ -1,5 +1,5 @@ /* Conversions between Unicode and legacy encodings. - Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2007, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c b/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c index 3fdc8ca..a75001d 100644 --- a/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c +++ b/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c @@ -1,5 +1,5 @@ /* Conversion to UTF-8 from legacy encodings. - Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gettext-tools/libgettextpo/unictype.in.h b/gettext-tools/libgettextpo/unictype.in.h index fdbfdd3..72b5f96 100644 --- a/gettext-tools/libgettextpo/unictype.in.h +++ b/gettext-tools/libgettextpo/unictype.in.h @@ -1,5 +1,5 @@ /* Unicode character classification and properties. - Copyright (C) 2002, 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gettext-tools/libgettextpo/unictype/bitmap.h b/gettext-tools/libgettextpo/unictype/bitmap.h index 19aea60..fa2f60e 100644 --- a/gettext-tools/libgettextpo/unictype/bitmap.h +++ b/gettext-tools/libgettextpo/unictype/bitmap.h @@ -1,5 +1,5 @@ /* Three-level bitmap lookup. - Copyright (C) 2000-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2000-2002, 2005-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2000-2002. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unictype/ctype_alpha.c b/gettext-tools/libgettextpo/unictype/ctype_alpha.c index d122fb0..aeb2f0f 100644 --- a/gettext-tools/libgettextpo/unictype/ctype_alpha.c +++ b/gettext-tools/libgettextpo/unictype/ctype_alpha.c @@ -1,5 +1,5 @@ /* ISO C <ctype.h> like properties of Unicode characters. - Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unictype/ctype_space.c b/gettext-tools/libgettextpo/unictype/ctype_space.c index 7bca2ac..81b349a 100644 --- a/gettext-tools/libgettextpo/unictype/ctype_space.c +++ b/gettext-tools/libgettextpo/unictype/ctype_space.c @@ -1,5 +1,5 @@ /* ISO C <ctype.h> like properties of Unicode characters. - Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unilbrk.in.h b/gettext-tools/libgettextpo/unilbrk.in.h index 0ff4556..da83e02 100644 --- a/gettext-tools/libgettextpo/unilbrk.in.h +++ b/gettext-tools/libgettextpo/unilbrk.in.h @@ -1,5 +1,5 @@ /* Line breaking of Unicode strings. - Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unilbrk/lbrktables.c b/gettext-tools/libgettextpo/unilbrk/lbrktables.c index 81a77b4..44ca9ce 100644 --- a/gettext-tools/libgettextpo/unilbrk/lbrktables.c +++ b/gettext-tools/libgettextpo/unilbrk/lbrktables.c @@ -1,5 +1,5 @@ /* Line breaking auxiliary tables. - Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unilbrk/lbrktables.h b/gettext-tools/libgettextpo/unilbrk/lbrktables.h index 42599ae..08fb533 100644 --- a/gettext-tools/libgettextpo/unilbrk/lbrktables.h +++ b/gettext-tools/libgettextpo/unilbrk/lbrktables.h @@ -1,5 +1,5 @@ /* Line breaking auxiliary tables. - Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c b/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c index e848a02..0e8ea6b 100644 --- a/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c +++ b/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c @@ -1,5 +1,5 @@ /* Line breaking of UTF-8 strings. - Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c b/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c index 1d95956..346fc52 100644 --- a/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c +++ b/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c @@ -1,5 +1,5 @@ /* Line breaking of UTF-8 strings. - Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unilbrk/ulc-common.c b/gettext-tools/libgettextpo/unilbrk/ulc-common.c index 9fd2624..68704b3 100644 --- a/gettext-tools/libgettextpo/unilbrk/ulc-common.c +++ b/gettext-tools/libgettextpo/unilbrk/ulc-common.c @@ -1,5 +1,5 @@ /* Line breaking auxiliary functions. - Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unilbrk/ulc-common.h b/gettext-tools/libgettextpo/unilbrk/ulc-common.h index 661270d..2a98ba2 100644 --- a/gettext-tools/libgettextpo/unilbrk/ulc-common.h +++ b/gettext-tools/libgettextpo/unilbrk/ulc-common.h @@ -1,5 +1,5 @@ /* Line breaking auxiliary functions. - Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c b/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c index 96f416e..4b1119d 100644 --- a/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c +++ b/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c @@ -1,5 +1,5 @@ /* Line breaking of strings. - Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistd.in.h b/gettext-tools/libgettextpo/unistd.in.h index 93f1ed9..a9ac097 100644 --- a/gettext-tools/libgettextpo/unistd.in.h +++ b/gettext-tools/libgettextpo/unistd.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <unistd.h>. - Copyright (C) 2003-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/unistr.in.h b/gettext-tools/libgettextpo/unistr.in.h index be158be..70aa9cb 100644 --- a/gettext-tools/libgettextpo/unistr.in.h +++ b/gettext-tools/libgettextpo/unistr.in.h @@ -1,5 +1,5 @@ /* Elementary Unicode string functions. - Copyright (C) 2001-2002, 2005-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c b/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c index 2e8487d..5e88e04 100644 --- a/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c +++ b/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c @@ -1,5 +1,5 @@ /* Conversion UTF-16 to UCS-4. - Copyright (C) 2001-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistr/u16-mbtouc.c b/gettext-tools/libgettextpo/unistr/u16-mbtouc.c index 75a2521..00c1025 100644 --- a/gettext-tools/libgettextpo/unistr/u16-mbtouc.c +++ b/gettext-tools/libgettextpo/unistr/u16-mbtouc.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-16 string. - Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistr/u8-check.c b/gettext-tools/libgettextpo/unistr/u8-check.c index 9c4a75c..786ebb5 100644 --- a/gettext-tools/libgettextpo/unistr/u8-check.c +++ b/gettext-tools/libgettextpo/unistr/u8-check.c @@ -1,5 +1,5 @@ /* Check UTF-8 string. - Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistr/u8-mblen.c b/gettext-tools/libgettextpo/unistr/u8-mblen.c index 32d960c..88b4cef 100644 --- a/gettext-tools/libgettextpo/unistr/u8-mblen.c +++ b/gettext-tools/libgettextpo/unistr/u8-mblen.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-8 string. - Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2015 Free Software + Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. diff --git a/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c b/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c index a751844..ca3c3ab 100644 --- a/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c +++ b/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c @@ -1,5 +1,5 @@ /* Conversion UTF-8 to UCS-4. - Copyright (C) 2001-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c b/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c index ae46311..2073d18 100644 --- a/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c +++ b/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c @@ -1,5 +1,5 @@ /* Conversion UTF-8 to UCS-4. - Copyright (C) 2001-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c b/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c index e27dd69..04ed687 100644 --- a/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c +++ b/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-8 string. - Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistr/u8-mbtouc.c b/gettext-tools/libgettextpo/unistr/u8-mbtouc.c index 2e9aced..edae650 100644 --- a/gettext-tools/libgettextpo/unistr/u8-mbtouc.c +++ b/gettext-tools/libgettextpo/unistr/u8-mbtouc.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-8 string. - Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c b/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c index 9cc1500..48f9ca3 100644 --- a/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c +++ b/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-8 string, returning an error code. - Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistr/u8-next.c b/gettext-tools/libgettextpo/unistr/u8-next.c index a1492b0..2e30476 100644 --- a/gettext-tools/libgettextpo/unistr/u8-next.c +++ b/gettext-tools/libgettextpo/unistr/u8-next.c @@ -1,5 +1,5 @@ /* Iterate over next character in UTF-8 string. - Copyright (C) 2002, 2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistr/u8-prev.c b/gettext-tools/libgettextpo/unistr/u8-prev.c index 20c8844..2fa94c9 100644 --- a/gettext-tools/libgettextpo/unistr/u8-prev.c +++ b/gettext-tools/libgettextpo/unistr/u8-prev.c @@ -1,5 +1,5 @@ /* Iterate over previous character in UTF-8 string. - Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistr/u8-strmbtouc.c b/gettext-tools/libgettextpo/unistr/u8-strmbtouc.c index a67a202..03e06b1 100644 --- a/gettext-tools/libgettextpo/unistr/u8-strmbtouc.c +++ b/gettext-tools/libgettextpo/unistr/u8-strmbtouc.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-8 string. - Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2015 Free Software + Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. diff --git a/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c b/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c index 65445be..d5ff1d6 100644 --- a/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c +++ b/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c @@ -1,5 +1,5 @@ /* Conversion UCS-4 to UTF-8. - Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unistr/u8-uctomb.c b/gettext-tools/libgettextpo/unistr/u8-uctomb.c index a8250f4..419a6b4 100644 --- a/gettext-tools/libgettextpo/unistr/u8-uctomb.c +++ b/gettext-tools/libgettextpo/unistr/u8-uctomb.c @@ -1,5 +1,5 @@ /* Store a character in UTF-8 string. - Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unitypes.in.h b/gettext-tools/libgettextpo/unitypes.in.h index d3c47ae..c6ca0ba 100644 --- a/gettext-tools/libgettextpo/unitypes.in.h +++ b/gettext-tools/libgettextpo/unitypes.in.h @@ -1,5 +1,5 @@ /* Elementary types and macros for the GNU UniString library. - Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gettext-tools/libgettextpo/uniwidth.in.h b/gettext-tools/libgettextpo/uniwidth.in.h index 7694beb..0ab6d25 100644 --- a/gettext-tools/libgettextpo/uniwidth.in.h +++ b/gettext-tools/libgettextpo/uniwidth.in.h @@ -1,5 +1,5 @@ /* Display width functions. - Copyright (C) 2001-2002, 2005, 2007, 2009-2015 Free Software Foundation, + Copyright (C) 2001-2002, 2005, 2007, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/uniwidth/cjk.h b/gettext-tools/libgettextpo/uniwidth/cjk.h index cdd9a55..0eac6fe 100644 --- a/gettext-tools/libgettextpo/uniwidth/cjk.h +++ b/gettext-tools/libgettextpo/uniwidth/cjk.h @@ -1,5 +1,5 @@ /* Test for CJK encoding. - Copyright (C) 2001-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/uniwidth/width.c b/gettext-tools/libgettextpo/uniwidth/width.c index c7e03b2..bd3b3fc 100644 --- a/gettext-tools/libgettextpo/uniwidth/width.c +++ b/gettext-tools/libgettextpo/uniwidth/width.c @@ -1,5 +1,5 @@ /* Determine display width of Unicode character. - Copyright (C) 2001-2002, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it diff --git a/gettext-tools/libgettextpo/unlocked-io.h b/gettext-tools/libgettextpo/unlocked-io.h index 06ffac6..c0ece50 100644 --- a/gettext-tools/libgettextpo/unlocked-io.h +++ b/gettext-tools/libgettextpo/unlocked-io.h @@ -1,6 +1,6 @@ /* Prefer faster, non-thread-safe stdio functions if available. - Copyright (C) 2001-2004, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/vasnprintf.c b/gettext-tools/libgettextpo/vasnprintf.c index 88332f0..72bf3bc 100644 --- a/gettext-tools/libgettextpo/vasnprintf.c +++ b/gettext-tools/libgettextpo/vasnprintf.c @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/vasnprintf.h b/gettext-tools/libgettextpo/vasnprintf.h index 3494eef..8e9d84f 100644 --- a/gettext-tools/libgettextpo/vasnprintf.h +++ b/gettext-tools/libgettextpo/vasnprintf.h @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2007-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/vasprintf.c b/gettext-tools/libgettextpo/vasprintf.c index 5dd4abd..a5dc1be 100644 --- a/gettext-tools/libgettextpo/vasprintf.c +++ b/gettext-tools/libgettextpo/vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/verify.h b/gettext-tools/libgettextpo/verify.h index 60eba49..2f43837 100644 --- a/gettext-tools/libgettextpo/verify.h +++ b/gettext-tools/libgettextpo/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/wchar.in.h b/gettext-tools/libgettextpo/wchar.in.h index 684299f..755600f 100644 --- a/gettext-tools/libgettextpo/wchar.in.h +++ b/gettext-tools/libgettextpo/wchar.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues. - Copyright (C) 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2007-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,7 +31,7 @@ @PRAGMA_COLUMNS@ #if (((defined __need_mbstate_t || defined __need_wint_t) \ - && !defined __MINGW32__) \ + && !defined __MINGW32__ && !defined __KLIBC__) \ || (defined __hpux \ && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ @@ -445,6 +445,11 @@ _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t)); # if !@HAVE_DECL_WCWIDTH@ /* wcwidth exists but is not declared. */ _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE); +# elif defined __KLIBC__ +/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a + static inline function. The implementation of wcwidth in wcwidth.c + causes a "conflicting types" error. */ +# undef wcwidth # endif _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); # endif diff --git a/gettext-tools/libgettextpo/wctype.in.h b/gettext-tools/libgettextpo/wctype.in.h index 9050b7e..3431854 100644 --- a/gettext-tools/libgettextpo/wctype.in.h +++ b/gettext-tools/libgettextpo/wctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 <wctype.h>, for platforms that lack it. - Copyright (C) 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2006-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/wcwidth.c b/gettext-tools/libgettextpo/wcwidth.c index d2b7118..b94fad0 100644 --- a/gettext-tools/libgettextpo/wcwidth.c +++ b/gettext-tools/libgettextpo/wcwidth.c @@ -1,5 +1,5 @@ /* Determine the number of screen columns needed for a character. - Copyright (C) 2006-2007, 2010-2015 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2010-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/xalloc.h b/gettext-tools/libgettextpo/xalloc.h index b261994..f4a329e 100644 --- a/gettext-tools/libgettextpo/xalloc.h +++ b/gettext-tools/libgettextpo/xalloc.h @@ -1,5 +1,5 @@ /* malloc with out of memory checking. - Copyright (C) 2001-2004, 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/xasprintf.c b/gettext-tools/libgettextpo/xasprintf.c index f8eef97..e9e83ef 100644 --- a/gettext-tools/libgettextpo/xasprintf.c +++ b/gettext-tools/libgettextpo/xasprintf.c @@ -1,5 +1,5 @@ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 1999, 2002-2004, 2006, 2009-2015 Free Software Foundation, + Copyright (C) 1999, 2002-2004, 2006, 2009-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/xconcat-filename.c b/gettext-tools/libgettextpo/xconcat-filename.c index 10ebbea..7e4593e 100644 --- a/gettext-tools/libgettextpo/xconcat-filename.c +++ b/gettext-tools/libgettextpo/xconcat-filename.c @@ -1,5 +1,5 @@ /* Construct a full filename from a directory and a relative filename. - Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/gettext-tools/libgettextpo/xerror.c b/gettext-tools/libgettextpo/xerror.c index 705b553..3c1e799 100644 --- a/gettext-tools/libgettextpo/xerror.c +++ b/gettext-tools/libgettextpo/xerror.c @@ -1,5 +1,5 @@ /* Multiline error-reporting functions. - Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/xerror.h b/gettext-tools/libgettextpo/xerror.h index fc8b163..d702c3a 100644 --- a/gettext-tools/libgettextpo/xerror.h +++ b/gettext-tools/libgettextpo/xerror.h @@ -1,5 +1,5 @@ /* Multiline error-reporting functions. - Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/xmalloc.c b/gettext-tools/libgettextpo/xmalloc.c index 43dcb94..9d435a5 100644 --- a/gettext-tools/libgettextpo/xmalloc.c +++ b/gettext-tools/libgettextpo/xmalloc.c @@ -1,6 +1,6 @@ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015 Free - Software Foundation, Inc. + Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015-2016 Free Software + Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/xmalloca.c b/gettext-tools/libgettextpo/xmalloca.c index 4fc7c8a..bcbed77 100644 --- a/gettext-tools/libgettextpo/xmalloca.c +++ b/gettext-tools/libgettextpo/xmalloca.c @@ -1,5 +1,5 @@ /* Safe automatic memory allocation with out of memory checking. - Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/xmalloca.h b/gettext-tools/libgettextpo/xmalloca.h index c067c8a..f90fa9f 100644 --- a/gettext-tools/libgettextpo/xmalloca.h +++ b/gettext-tools/libgettextpo/xmalloca.h @@ -1,5 +1,5 @@ /* Safe automatic memory allocation with out of memory checking. - Copyright (C) 2003, 2005, 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2003, 2005, 2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/xsize.h b/gettext-tools/libgettextpo/xsize.h index b2a786a..202a87e 100644 --- a/gettext-tools/libgettextpo/xsize.h +++ b/gettext-tools/libgettextpo/xsize.h @@ -1,6 +1,6 @@ /* xsize.h -- Checked size_t computations. - Copyright (C) 2003, 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2003, 2008-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/xstrdup.c b/gettext-tools/libgettextpo/xstrdup.c index 7aa09dc..c7fbe14 100644 --- a/gettext-tools/libgettextpo/xstrdup.c +++ b/gettext-tools/libgettextpo/xstrdup.c @@ -1,5 +1,5 @@ /* xstrdup.c -- copy a string with out of memory checking - Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015 Free Software + Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/xstriconv.c b/gettext-tools/libgettextpo/xstriconv.c index d5e1951..2dbee18 100644 --- a/gettext-tools/libgettextpo/xstriconv.c +++ b/gettext-tools/libgettextpo/xstriconv.c @@ -1,5 +1,5 @@ /* Charset conversion with out-of-memory checking. - Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/xstriconv.h b/gettext-tools/libgettextpo/xstriconv.h index 6319989..61e7c75 100644 --- a/gettext-tools/libgettextpo/xstriconv.h +++ b/gettext-tools/libgettextpo/xstriconv.h @@ -1,5 +1,5 @@ /* Charset conversion with out-of-memory checking. - Copyright (C) 2001-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software: you can redistribute it and/or modify diff --git a/gettext-tools/libgettextpo/xvasprintf.c b/gettext-tools/libgettextpo/xvasprintf.c index 441ab59..9deaad0 100644 --- a/gettext-tools/libgettextpo/xvasprintf.c +++ b/gettext-tools/libgettextpo/xvasprintf.c @@ -1,5 +1,5 @@ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 1999, 2002-2004, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2004, 2006-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gettext-tools/libgettextpo/xvasprintf.h b/gettext-tools/libgettextpo/xvasprintf.h index 3b7f5ad..d62d7b7 100644 --- a/gettext-tools/libgettextpo/xvasprintf.h +++ b/gettext-tools/libgettextpo/xvasprintf.h @@ -1,5 +1,5 @@ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 2002-2004, 2006-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2006-2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |