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

diff --git a/ChangeLog b/ChangeLog
index 141fb15..449a195 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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.
        * lib/localename.c (gl_locale_name_thread_unsafe): On MacOS X, try the
        memory layout of the locales in MacOS X 10.6 as well.

diff --git a/lib/locale.in.h b/lib/locale.in.h
index ad92d8f..75b5299 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