blob: e5a58e8d47202ac30b05f3b8bb4b2118f0d14534 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
Index: source/common/stringpiece.cpp
===================================================================
--- source/common/stringpiece.cpp (revision 158118)
+++ source/common/stringpiece.cpp (working copy)
@@ -75,7 +75,7 @@
* Visual Studios 9.0.
* Cygwin with MSVC 9.0 also complains here about redefinition.
*/
-#if (!defined(_MSC_VER) || (_MSC_VER > 1600)) && !defined(CYGWINMSVC)
+#if (!defined(_MSC_VER) || (_MSC_VER > 1800)) && !defined(CYGWINMSVC)
const int32_t StringPiece::npos;
#endif
Index: source/common/unicode/pwin32.h
===================================================================
--- source/common/unicode/pwin32.h (revision 158118)
+++ source/common/unicode/pwin32.h (working copy)
@@ -26,6 +26,10 @@
#define U_WINDOWS
#endif
+#if _MSC_VER >= 1600
+#include <stdint.h>
+#endif
+
#if defined(__BORLANDC__)
#define U_HAVE_PLACEMENT_NEW 0
#define __STDC_CONSTANT_MACROS
|
