diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:32 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:32 +0100 |
| commit | 00893e79fc62966067af1a106567db96bd170338 (patch) | |
| tree | 52b35cd0b42ca28e62a2ffbecade2e13dd8332cf /gnulib-m4/locale_h.m4 | |
| parent | 26112352a774737e1ce5580c93654a26c1e82b39 (diff) | |
New upstream version 1.2upstream/1.2
Diffstat (limited to 'gnulib-m4/locale_h.m4')
| -rw-r--r-- | gnulib-m4/locale_h.m4 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnulib-m4/locale_h.m4 b/gnulib-m4/locale_h.m4 index ca5d0d0f..c47e3f6f 100644 --- a/gnulib-m4/locale_h.m4 +++ b/gnulib-m4/locale_h.m4 @@ -1,5 +1,5 @@ -# locale_h.m4 serial 28 -dnl Copyright (C) 2007, 2009-2022 Free Software Foundation, Inc. +# locale_h.m4 serial 31 +dnl Copyright (C) 2007, 2009-2024 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. @@ -59,7 +59,9 @@ AC_DEFUN_ONCE([gl_LOCALE_H], dnl On native Windows with MSVC, merely define these member names as macros. dnl This avoids trouble in C++ mode. case "$host_os" in - mingw*) + windows*-msvc*) + ;; + mingw* | windows*) AC_EGREP_CPP([Special], [ #ifdef _MSC_VER Special @@ -152,7 +154,7 @@ AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE_NULL]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUPLOCALE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME_UNSAFE]) ]) m4_require(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS]) AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) |