Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Unified Diff: vs2012.patch

Issue 23889022: Fix icu compilation on VS2013 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/icu46/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/common/stringpiece.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: vs2012.patch
===================================================================
--- vs2012.patch (revision 222915)
+++ vs2012.patch (working copy)
@@ -1,29 +0,0 @@
-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 > 1700)) && !defined(CYGWINMSVC)
- const int32_t StringPiece::npos;
- #endif
-
-Index: public/common/unicode/pwin32.h
-===================================================================
---- public/common/unicode/pwin32.h (revision 158118)
-+++ public/common/unicode/pwin32.h (working copy)
-@@ -26,6 +26,10 @@
- #define U_WINDOWS
- #endif
-
-+#if _MSC_VER >= 1700
-+#include <stdint.h>
-+#endif
-+
- #if defined(__BORLANDC__)
- #define U_HAVE_PLACEMENT_NEW 0
- #define __STDC_CONSTANT_MACROS
-
« no previous file with comments | « source/common/stringpiece.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698