From 6909b8edbea806a3bd50aa9baa600cdd3a0a760e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 2 Jan 2020 16:12:04 +0100 Subject: [PATCH] setlocale-null: Avoid crashing the MSVC linker. * lib/setlocale-lock.c: Don't define IMP(gl_get_setlocale_null_lock) on MSVC. --- ChangeLog | 6 ++++++ lib/setlocale-lock.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e3c40d7f19..b128313405 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-01-02 Bruno Haible + + setlocale-null: Avoid crashing the MSVC linker. + * lib/setlocale-lock.c: Don't define IMP(gl_get_setlocale_null_lock) on + MSVC. + 2020-01-02 Bruno Haible wchar: Make the HP-UX workaround work on HP-UX 11.31. diff --git a/lib/setlocale-lock.c b/lib/setlocale-lock.c index 4bbe6eb54f..7dde32d188 100644 --- a/lib/setlocale-lock.c +++ b/lib/setlocale-lock.c @@ -136,7 +136,7 @@ gl_get_setlocale_null_lock (void) # endif -# if defined _WIN32 || defined __CYGWIN__ +# if (defined _WIN32 || defined __CYGWIN__) && !defined _MSC_VER /* Make sure the '__declspec(dllimport)' in setlocale_null.c does not cause a link failure when no DLLs are involved. */ # if defined _WIN64 || defined _LP64 -- 2.39.5