X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FconfigCompiler.h.msvc;h=bec1a4113caa69de150cb8205052d45d10346566;hb=230cc9bc5b449d05be1a555a72bf2b7ab2906650;hp=37ab612e1c01d942ecf64c907ca2937c4f698932;hpb=7ad91d8646c0590ecfd80150e424feb725298c16;p=lyx.git

diff --git a/development/cmake/configCompiler.h.msvc b/development/cmake/configCompiler.h.msvc
index 37ab612e1c..bec1a4113c 100644
--- a/development/cmake/configCompiler.h.msvc
+++ b/development/cmake/configCompiler.h.msvc
@@ -43,8 +43,10 @@
 #define HAVE__PCLOSE 1
 #define HAVE_GETPID 1
 #define HAVE__GETPID 1
+#define HAVE_GETTEXT 1 /* TODO this is set manually */
 #define HAVE_MKDIR 1
 #define HAVE__MKDIR 1
+/* #undef HAVE_SETENV 1 */
 #define HAVE_PUTENV 1
 #define HAVE_MKTEMP 1
 /* #undef HAVE_MKSTEMP 1 */
@@ -122,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
@@ -146,22 +142,14 @@
 #  define BOOST_POSIX_PATH 1
 #endif
 
-#ifndef HAVE_NEWAPIS_H
-#  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
+#  define USE_WCHAR_T
 #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__)
-#  define USE_WCHAR_T
+#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)
@@ -180,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