From: Bruno Haible <bruno@clisp.org>
Date: Tue, 24 Dec 2019 16:37:19 +0000 (+0100)
Subject: Update after gnulib changed: Fix test failures on FreeBSD, NetBSD, macOS.
X-Git-Tag: v0.20.2~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96abb3ead73cf6ac8fa900f56caa8473fb99d28b;p=thirdparty%2Fgettext.git

Update after gnulib changed: Fix test failures on FreeBSD, NetBSD, macOS.

* gettext-tools/tests/setlocale.c (setlocale): Undefine.
---

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 <locale.h>
 #include <string.h>
 
+/* 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)