From 0ac58a14d1ab53083aa705e24e78672245945b0c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Tue, 26 Jun 2007 18:35:52 +0000 Subject: [PATCH] cmake part of bug 3527, with macro USE_WCHAR_T git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18899 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/config.h.cmake | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake index 37351890d2..3bd17bc019 100644 --- a/development/cmake/config.h.cmake +++ b/development/cmake/config.h.cmake @@ -160,8 +160,19 @@ # define WANT_GETFILEATTRIBUTESEX_WRAPPER 1 #endif -#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 -# define LIBC_WCTYPE_USES_UCS4 + +/* + * 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__) +# define USE_WCHAR_T #endif #if defined(MAKE_INTL_LIB) && defined(_MSC_VER) -- 2.39.2