Fix icu compilation on VS2013
(And move .patch file which was accidentally in the root).
R=jshin@chromium.org
BUG=288948
Review URL: https://chromiumcodereview.appspot.com/23889022
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/icu46@223384 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/README.chromium b/README.chromium
index 76acd4b..07d2898 100644
--- a/README.chromium
+++ b/README.chromium
@@ -248,7 +248,7 @@
- patches/utext.patch
- upstream change : http://bugs.icu-project.org/trac/changeset/29356
-24. Fix compilation errors on VS2012.
+24. Fix compilation errors on VS2012 and above.
- patches/vs2012.patch
25. Fix a buffer overflow in UTF-16/32 detection.
diff --git a/vs2012.patch b/patches/vs2012.patch
similarity index 92%
rename from vs2012.patch
rename to patches/vs2012.patch
index abf969f..8ede5d3 100644
--- a/vs2012.patch
+++ b/patches/vs2012.patch
@@ -7,7 +7,7 @@
* 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)
++#if (!defined(_MSC_VER) || (_MSC_VER > 1800)) && !defined(CYGWINMSVC)
const int32_t StringPiece::npos;
#endif
diff --git a/source/common/stringpiece.cpp b/source/common/stringpiece.cpp
index de98d3d..42caf01 100644
--- a/source/common/stringpiece.cpp
+++ b/source/common/stringpiece.cpp
@@ -75,7 +75,7 @@
* Visual Studios 9.0.
* Cygwin with MSVC 9.0 also complains here about redefinition.
*/
-#if (!defined(_MSC_VER) || (_MSC_VER > 1700)) && !defined(CYGWINMSVC)
+#if (!defined(_MSC_VER) || (_MSC_VER > 1800)) && !defined(CYGWINMSVC)
const int32_t StringPiece::npos;
#endif
