X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fstrfwd.h;h=58b44f59b3cd09effa4e639ab22b62061855f12e;hb=5d3d26b0241da8f28e0b6b7cce23a8c5761e43de;hp=30e1c092f07675fe9104586c5adb09cacd0f1658;hpb=7a60c96dfa151d5c3bf4510c1889297de95b3c07;p=lyx.git

diff --git a/src/support/strfwd.h b/src/support/strfwd.h
index 30e1c092f0..58b44f59b3 100644
--- a/src/support/strfwd.h
+++ b/src/support/strfwd.h
@@ -23,8 +23,14 @@ namespace lyx { typedef wchar_t char_type; }
 
 #else
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#include <cstdint>
+namespace lyx { typedef uint32_t char_type; }
+#include "support/numpunct_lyx_char_type.h" // implementation for our char_type needed
+#else
 #include <boost/cstdint.hpp>
 namespace lyx { typedef boost::uint32_t char_type; }
+#endif
 
 #endif
 
@@ -62,12 +68,7 @@ typedef basic_ostringstream<char, char_traits<char>, allocator<char> > ostringst
 #endif
 
 
-// Ugly workaround for MSVC10 STL bug:
-// std::numpunct has a hardcoded dllimport in definition, but we wanna it with 32 bit 
-// so we can't import it and must define it but then the compiler complains.
-#if defined(_MSC_VER) && (_MSC_VER >= 1600) 
-#include "support/numpunct_lyx_char_type.h"
-#endif
+
 
 
 namespace lyx {