locale: Make C++ tests work on Cygwin and mingw.

diff --git a/ChangeLog b/ChangeLog
index 141fb15f7241986bc64cc6b3a95fcca2cb7b429b..449a195cdbbd02c9cf7a868a1e3ef18fd0a21e1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-03  Bruno Haible  <bruno@clisp.org>
+
+       locale: Make C++ tests work on Cygwin and mingw.
+       * lib/locale.in.h (duplocale): Don't use _GL_CXXALIASWARN if gnulib
+       cannot provide the function.
+       Reported by Simon Josefsson.
+
 2010-04-03  Bruno Haible  <bruno@clisp.org>
 
        localename: Port to MacOS X 10.6.

diff --git a/lib/locale.in.h b/lib/locale.in.h
index ad92d8f2b0c13bae1673e4302f4bf7a66f25f4dc..75b529932b2817e0042ff0f10f59619c2c420427 100644 (file)
--- a/lib/locale.in.h
+++ b/lib/locale.in.h
@@ -59,7 +59,9 @@ _GL_CXXALIAS_RPL (duplocale, locale_t, (locale_t locale));
 _GL_CXXALIAS_SYS (duplocale, locale_t, (locale_t locale));
 #  endif
 # endif
+# if @HAVE_DUPLOCALE@
 _GL_CXXALIASWARN (duplocale);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef duplocale
 # if HAVE_RAW_DECL_DUPLOCALE