From: Bruno Haible Date: Sun, 6 Jan 2019 21:40:38 +0000 (+0100) Subject: Update after gnulib changed. X-Git-Tag: v0.20~191 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51f1ffc2e15a958c7ceba883aa248aac82ef4cc9;p=thirdparty%2Fgettext.git Update after gnulib changed. --- diff --git a/gettext-runtime/intl/localename-table.c b/gettext-runtime/intl/localename-table.c index 4b0810d1e..10be7bedf 100644 --- a/gettext-runtime/intl/localename-table.c +++ b/gettext-runtime/intl/localename-table.c @@ -18,7 +18,7 @@ #include -#if HAVE_USELOCALE && HAVE_NAMELESS_LOCALES +#if HAVE_WORKING_USELOCALE && HAVE_NAMELESS_LOCALES /* Specification. */ #include "localename-table.h" diff --git a/gettext-runtime/intl/localename-table.in.h b/gettext-runtime/intl/localename-table.in.h index 07e92f661..6b2a807be 100644 --- a/gettext-runtime/intl/localename-table.in.h +++ b/gettext-runtime/intl/localename-table.in.h @@ -16,7 +16,7 @@ /* Written by Bruno Haible , 2018. */ -#if HAVE_USELOCALE && HAVE_NAMELESS_LOCALES +#if HAVE_WORKING_USELOCALE && HAVE_NAMELESS_LOCALES # include # include diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c index 3fddbf988..857a76d72 100644 --- a/gettext-runtime/intl/localename.c +++ b/gettext-runtime/intl/localename.c @@ -1,5 +1,5 @@ /* Determine name of the currently selected locale. - Copyright (C) 1995-2018 Free Software Foundation, Inc. + Copyright (C) 1995-2019 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -35,7 +35,13 @@ #include "flexmember.h" -#if HAVE_USELOCALE +/* We cannot support uselocale() on platforms where the locale_t type is fake. + See intl-thread-locale.m4 for details. */ +#if HAVE_WORKING_USELOCALE && !HAVE_FAKE_LOCALES +# define HAVE_GOOD_USELOCALE 1 +#endif + +#if HAVE_GOOD_USELOCALE /* Mac OS X 10.5 defines the locale_t type in . */ # if defined __APPLE__ && defined __MACH__ # include @@ -2623,7 +2629,8 @@ get_lcid (const char *locale_name) #endif -#if HAVE_USELOCALE /* glibc, Mac OS X, Solaris 11 OpenIndiana, or Solaris >= 11.4 */ +#if HAVE_GOOD_USELOCALE /* glibc, Mac OS X, FreeBSD >= 9.1, Cygwin >= 2.6, + Solaris 11 OpenIndiana, or Solaris >= 11.4 */ /* Simple hash set of strings. We don't want to drag in lots of hash table code here. */ @@ -2708,7 +2715,7 @@ struniq (const char *string) #endif -#if HAVE_USELOCALE && HAVE_NAMELESS_LOCALES +#if HAVE_GOOD_USELOCALE && HAVE_NAMELESS_LOCALES /* The 'locale_t' object does not contain the names of the locale categories. We have to associate them with the object through a hash table. @@ -3088,7 +3095,7 @@ freelocale (locale_t locale) #endif -#if defined IN_LIBINTL || HAVE_USELOCALE +#if defined IN_LIBINTL || HAVE_GOOD_USELOCALE /* Like gl_locale_name_thread, except that the result is not in storage of indefinite extent. */ @@ -3098,7 +3105,7 @@ static const char * gl_locale_name_thread_unsafe (int category, const char *categoryname) { -# if HAVE_USELOCALE +# if HAVE_GOOD_USELOCALE { locale_t thread_locale = uselocale (NULL); if (thread_locale != LC_GLOBAL_LOCALE) @@ -3211,7 +3218,7 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname) const char * gl_locale_name_thread (int category, const char *categoryname) { -#if HAVE_USELOCALE +#if HAVE_GOOD_USELOCALE const char *name = gl_locale_name_thread_unsafe (category, categoryname); if (name != NULL) return struniq (name); @@ -3262,7 +3269,7 @@ gl_locale_name_posix (int category, const char *categoryname) /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'. On some systems this can be done by the 'setlocale' function itself. */ -#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL +#if defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL locname = setlocale (category, NULL); #else /* On other systems we ignore what setlocale reports and instead look at the diff --git a/gettext-runtime/intl/lock.h b/gettext-runtime/intl/lock.h index c013a9a5d..53350ecd5 100644 --- a/gettext-runtime/intl/lock.h +++ b/gettext-runtime/intl/lock.h @@ -416,6 +416,9 @@ extern "C" { # pragma weak pth_rwlock_acquire # pragma weak pth_rwlock_release # pragma weak pth_once +# pragma weak pth_cond_init +# pragma weak pth_cond_await +# pragma weak pth_cond_notify # pragma weak pth_cancel # define pth_in_use() (pth_cancel != NULL) diff --git a/gettext-runtime/intl/verify.h b/gettext-runtime/intl/verify.h index f6c87691a..36354359f 100644 --- a/gettext-runtime/intl/verify.h +++ b/gettext-runtime/intl/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2018 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/gettext-runtime/intl/xsize.h b/gettext-runtime/intl/xsize.h index 544aeaa98..34b696fb5 100644 --- a/gettext-runtime/intl/xsize.h +++ b/gettext-runtime/intl/xsize.h @@ -1,6 +1,6 @@ /* xsize.h -- Checked size_t computations. - Copyright (C) 2003, 2008-2018 Free Software Foundation, Inc. + Copyright (C) 2003, 2008-2019 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/gettext-runtime/m4/fcntl-o.m4 b/gettext-runtime/m4/fcntl-o.m4 index cffb9de17..6ab3387da 100644 --- a/gettext-runtime/m4/fcntl-o.m4 +++ b/gettext-runtime/m4/fcntl-o.m4 @@ -1,5 +1,5 @@ # fcntl-o.m4 serial 6 -dnl Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/flexmember.m4 b/gettext-runtime/m4/flexmember.m4 index db93cf358..1347068fe 100644 --- a/gettext-runtime/m4/flexmember.m4 +++ b/gettext-runtime/m4/flexmember.m4 @@ -1,7 +1,7 @@ # serial 5 # Check for flexible array member support. -# Copyright (C) 2006, 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/glibc2.m4 b/gettext-runtime/m4/glibc2.m4 index b8608334e..17a700400 100644 --- a/gettext-runtime/m4/glibc2.m4 +++ b/gettext-runtime/m4/glibc2.m4 @@ -1,5 +1,5 @@ # glibc2.m4 serial 3 -dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2018 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2019 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/gettext-runtime/m4/glibc21.m4 b/gettext-runtime/m4/glibc21.m4 index 126aa1a95..0ab0f235a 100644 --- a/gettext-runtime/m4/glibc21.m4 +++ b/gettext-runtime/m4/glibc21.m4 @@ -1,5 +1,5 @@ # glibc21.m4 serial 5 -dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2018 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2019 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4 index 877d8822d..a285e9daa 100644 --- a/gettext-runtime/m4/iconv.m4 +++ b/gettext-runtime/m4/iconv.m4 @@ -1,5 +1,5 @@ # iconv.m4 serial 21 -dnl Copyright (C) 2000-2002, 2007-2014, 2016-2018 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2007-2014, 2016-2019 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/gettext-runtime/m4/intdiv0.m4 b/gettext-runtime/m4/intdiv0.m4 index 8be9951fe..e63fcf100 100644 --- a/gettext-runtime/m4/intdiv0.m4 +++ b/gettext-runtime/m4/intdiv0.m4 @@ -1,5 +1,5 @@ # intdiv0.m4 serial 6 (gettext-0.18.2) -dnl Copyright (C) 2002, 2007-2008, 2010-2018 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007-2008, 2010-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/intlmacosx.m4 b/gettext-runtime/m4/intlmacosx.m4 index 17c1bd4a0..7a474270b 100644 --- a/gettext-runtime/m4/intlmacosx.m4 +++ b/gettext-runtime/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ # intlmacosx.m4 serial 6 (gettext-0.19.9) -dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014, 2016, 2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/intmax.m4 b/gettext-runtime/m4/intmax.m4 index 6c395389c..2f4b450bf 100644 --- a/gettext-runtime/m4/intmax.m4 +++ b/gettext-runtime/m4/intmax.m4 @@ -1,5 +1,5 @@ # intmax.m4 serial 6 (gettext-0.18.2) -dnl Copyright (C) 2002-2005, 2008-2018 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2005, 2008-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/inttypes-pri.m4 b/gettext-runtime/m4/inttypes-pri.m4 index c8442625d..38fe118a3 100644 --- a/gettext-runtime/m4/inttypes-pri.m4 +++ b/gettext-runtime/m4/inttypes-pri.m4 @@ -1,5 +1,5 @@ # inttypes-pri.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1997-2002, 2006, 2008-2018 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2002, 2006, 2008-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/inttypes_h.m4 b/gettext-runtime/m4/inttypes_h.m4 index 954848bd3..d20422a44 100644 --- a/gettext-runtime/m4/inttypes_h.m4 +++ b/gettext-runtime/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ # inttypes_h.m4 serial 10 -dnl Copyright (C) 1997-2004, 2006, 2008-2018 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/nls.m4 b/gettext-runtime/m4/nls.m4 index afdb9cacd..b62f61485 100644 --- a/gettext-runtime/m4/nls.m4 +++ b/gettext-runtime/m4/nls.m4 @@ -1,5 +1,5 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019 Free Software dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/gettext-runtime/m4/printf-posix.m4 b/gettext-runtime/m4/printf-posix.m4 index 3f2f93fff..2707cf745 100644 --- a/gettext-runtime/m4/printf-posix.m4 +++ b/gettext-runtime/m4/printf-posix.m4 @@ -1,5 +1,5 @@ # printf-posix.m4 serial 6 (gettext-0.18.2) -dnl Copyright (C) 2003, 2007, 2009-2018 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/progtest.m4 b/gettext-runtime/m4/progtest.m4 index 5c6311a21..5f186b149 100644 --- a/gettext-runtime/m4/progtest.m4 +++ b/gettext-runtime/m4/progtest.m4 @@ -1,5 +1,5 @@ # progtest.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1996-2003, 2005, 2008-2018 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2005, 2008-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/size_max.m4 b/gettext-runtime/m4/size_max.m4 index 3e3986e15..ab79052d6 100644 --- a/gettext-runtime/m4/size_max.m4 +++ b/gettext-runtime/m4/size_max.m4 @@ -1,5 +1,5 @@ # size_max.m4 serial 11 -dnl Copyright (C) 2003, 2005-2006, 2008-2018 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2006, 2008-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/stdint_h.m4 b/gettext-runtime/m4/stdint_h.m4 index 2d2a33c43..6d5f1af0a 100644 --- a/gettext-runtime/m4/stdint_h.m4 +++ b/gettext-runtime/m4/stdint_h.m4 @@ -1,5 +1,5 @@ # stdint_h.m4 serial 9 -dnl Copyright (C) 1997-2004, 2006, 2008-2018 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/uintmax_t.m4 b/gettext-runtime/m4/uintmax_t.m4 index 0fe9bd629..2926bea94 100644 --- a/gettext-runtime/m4/uintmax_t.m4 +++ b/gettext-runtime/m4/uintmax_t.m4 @@ -1,5 +1,5 @@ # uintmax_t.m4 serial 12 -dnl Copyright (C) 1997-2004, 2007-2018 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2007-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/visibility.m4 b/gettext-runtime/m4/visibility.m4 index f53e0d524..8c266a81a 100644 --- a/gettext-runtime/m4/visibility.m4 +++ b/gettext-runtime/m4/visibility.m4 @@ -1,5 +1,5 @@ # visibility.m4 serial 6 -dnl Copyright (C) 2005, 2008, 2010-2018 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008, 2010-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/xsize.m4 b/gettext-runtime/m4/xsize.m4 index fc7c1ab3b..f2898ba1a 100644 --- a/gettext-runtime/m4/xsize.m4 +++ b/gettext-runtime/m4/xsize.m4 @@ -1,5 +1,5 @@ # xsize.m4 serial 5 -dnl Copyright (C) 2003-2004, 2008-2018 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2004, 2008-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.