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