diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | modules/hard-locale-tests | 5 |
2 files changed, 10 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2020-01-01 Bruno Haible <bruno@clisp.org> + hard-locale tests: Fix a conflict with the C++ tests. + * modules/hard-locale-tests (Makefile.am): Build a program named + 'current-locale', not 'locale'. + +2020-01-01 Bruno Haible <bruno@clisp.org> + doc: Update documentation about wchar_t. * doc/*/*wc*.texi: Clarify that 64-bit AIX does not have a too small wchar_t type. diff --git a/modules/hard-locale-tests b/modules/hard-locale-tests index ddd101f175..ac7fcb2a67 100644 --- a/modules/hard-locale-tests +++ b/modules/hard-locale-tests @@ -15,5 +15,8 @@ AC_CHECK_FUNCS_ONCE([duplocale]) Makefile.am: TESTS += test-hard-locale check_PROGRAMS += test-hard-locale -noinst_PROGRAMS += locale test_hard_locale_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIB_HARD_LOCALE@ +# We cannot call this program 'locale', because the C++ compiler on Mac OS X +# would then barf upon '#include <locale>'. So, call it 'current-locale'. +noinst_PROGRAMS += current-locale +current_locale_SOURCES = locale.c |