Cmake export tests: Ignore missing glyphs on some tests

[lyx.git] / development / cmake / configCompiler.h.msvc

diff --git a/development/cmake/configCompiler.h.msvc b/development/cmake/configCompiler.h.msvc
index d978be1ea8c4af0c853b8c971448df536fde4490..bec1a4113caa69de150cb8205052d45d10346566 100644 (file)
--- a/development/cmake/configCompiler.h.msvc
+++ b/development/cmake/configCompiler.h.msvc
@@ -124,12 +124,6 @@
 
 #define BOOST_ALL_NO_LIB 1
 
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#  define USE_BOOST_FORMAT 1
-#else
-#  define USE_BOOST_FORMAT 0
-#endif
-
 #ifdef _DEBUG
 #  define ENABLE_ASSERTIONS 1
 #endif
@@ -152,6 +146,12 @@
 #  define USE_WCHAR_T
 #endif
 
+#ifdef HAVE_LONG_LONG
+#ifdef SIZEOF_LONG_LONG_GREATER_THAN_SIZEOF_LONG
+#define LYX_USE_LONG_LONG
+#endif
+#endif
+
 #if defined(MAKE_INTL_LIB) && defined(_MSC_VER)
 #define __attribute__(x)
 #define inline
@@ -168,6 +168,9 @@
 #define HAVE_MODE_T
 #endif
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#include "support/strfwd.h" // always first, to prevent compiler's interpretation/instantiations of some typedef
+#endif
 
 
 #endif