From ca7214b410d80c2108dfb43b89cf3c8fc5073882 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Thu, 17 Oct 2013 23:39:36 +0300 Subject: [PATCH] Remove FreeBSD checks when defining USE_WCHAR_T. The problems the comments in the build systems refer to seem to have been fixed for years. [1] says the checks in libstdc++ have been improved, and all supported FreeBSD versions enable wchar_t support unconditionally in libstdc++. Additionally, this needlessly impacts FreeBSD when libc++ is used instead of libstdc++. [1] http://gcc.gnu.org/onlinedocs/libstdc++/faq.html#faq.freebsd_wchar --- configure.ac | 12 +----------- development/cmake/configCompiler.h.cmake | 12 +----------- development/cmake/configCompiler.h.msvc | 12 +----------- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/configure.ac b/configure.ac index 75e74ac34a..9116b0ddf6 100644 --- a/configure.ac +++ b/configure.ac @@ -290,17 +290,7 @@ char * strerror(int n); # define BOOST_POSIX_PATH 1 #endif -/* - * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t - * support compiled in: - * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9 - * And we are not interested at all what libc - * does: What we need is a 32bit wide wchar_t, and a libstdc++ that - * has the needed wchar_t support and uses UCS4. Whether it - * implements this with the help of libc, or whether it has own code - * does not matter for us, because we do not use libc directly (Georg) -*/ -#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) +#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 # define USE_WCHAR_T #endif diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake index e833a036e1..858cfc9711 100644 --- a/development/cmake/configCompiler.h.cmake +++ b/development/cmake/configCompiler.h.cmake @@ -102,17 +102,7 @@ # define BOOST_POSIX_PATH 1 #endif -/* - * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t - * support compiled in: - * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9 - * And we are not interested at all what libc - * does: What we need is a 32bit wide wchar_t, and a libstdc++ that - * has the needed wchar_t support and uses UCS4. Whether it - * implements this with the help of libc, or whether it has own code - * does not matter for us, because we don't use libc directly (Georg) -*/ -#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) +#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 # define USE_WCHAR_T #endif diff --git a/development/cmake/configCompiler.h.msvc b/development/cmake/configCompiler.h.msvc index d4007daf7e..d978be1ea8 100644 --- a/development/cmake/configCompiler.h.msvc +++ b/development/cmake/configCompiler.h.msvc @@ -148,17 +148,7 @@ # define BOOST_POSIX_PATH 1 #endif -/* - * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t - * support compiled in: - * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9 - * And we are not interested at all what libc - * does: What we need is a 32bit wide wchar_t, and a libstdc++ that - * has the needed wchar_t support and uses UCS4. Whether it - * implements this with the help of libc, or whether it has own code - * does not matter for us, because we don't use libc directly (Georg) -*/ -#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) +#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 # define USE_WCHAR_T #endif