From be584c56eb1311606e5ea1a36363b97bddb6eed3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 25 Dec 2019 00:00:44 +0100 Subject: [PATCH] localcharset: Avoid referencing rpl_setlocale on native Windows. * lib/localcharset.c (setlocale): Undefine. --- ChangeLog | 5 +++++ lib/localcharset.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index ea866fb0df..40f74abdde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-12-24 Bruno Haible + + localcharset: Avoid referencing rpl_setlocale on native Windows. + * lib/localcharset.c (setlocale): Undefine. + 2019-12-24 Bruno Haible lock tests: Fix link error on HP-UX/hppa (regression from 2019-12-21). diff --git a/lib/localcharset.c b/lib/localcharset.c index ffc0d8f73f..5dd44291b4 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -58,6 +58,9 @@ #elif defined WINDOWS_NATIVE # define WIN32_LEAN_AND_MEAN # include + /* For the use of setlocale() below, the Gnulib override in setlocale.c is + not needed; see the platform lists in setlocale_null.m4. */ +# undef setlocale #endif #if defined OS2 # define INCL_DOS -- 2.39.5