From 96abb3ead73cf6ac8fa900f56caa8473fb99d28b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 24 Dec 2019 17:37:19 +0100 Subject: [PATCH] Update after gnulib changed: Fix test failures on FreeBSD, NetBSD, macOS. * gettext-tools/tests/setlocale.c (setlocale): Undefine. --- gettext-tools/tests/setlocale.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gettext-tools/tests/setlocale.c b/gettext-tools/tests/setlocale.c index ce60424a4..c9ce44c5c 100644 --- a/gettext-tools/tests/setlocale.c +++ b/gettext-tools/tests/setlocale.c @@ -1,5 +1,5 @@ /* Fake setlocale - platform independent, for testing purposes. - Copyright (C) 2001-2002 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2019 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,6 +22,12 @@ #include #include +/* Make this override available independently of possible overrides in + libgnuintl.h or locale.h. + Note: On platforms where _nl_locale_name_posix invokes setlocale_null, this + override *must* be called 'setlocale'. */ +#undef setlocale + /* Return string representation of locale CATEGORY. */ static const char * category_to_name (int category) -- 2.47.2