* configure.ac:

* development/cmake/config.h.cmake:
* development/scons/SConstruct:
	- fix casing of __FreeBSD__ macro, also check for __FreeBSD_kernel__
	  (fixes bug 3537)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19066 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/configure.ac b/configure.ac
index a953b1421cd2611557e692fa8cd5522d3ba1bd00..36e00e52bc2ef1af8abdae9ffa41039594a1457a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -393,7 +393,7 @@ int mkstemp(char*);
  * 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__)
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
 #  define USE_WCHAR_T
 #endif
 

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 3bd17bc0197424d87b2a61a88b9b70297d252aa7..91f026edee72ac135d94f6d1a2bd53c5f117cb9b 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -171,7 +171,7 @@
  * 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__)
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
 #  define USE_WCHAR_T
 #endif
 

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 687366f2607ffcf09f7a56778a128346034463ee..c4cab67f102d169536c248a961a590f79e74b7cd 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -829,7 +829,7 @@ utils.createConfigFile(conf,
  * 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__)
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
 #  define USE_WCHAR_T
 #endif