commit 128ef5299fa05afeab12683dbb42e2a81cadb585
author bradnelson@google.com <bradnelson@google.com@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Tue Mar 29 00:06:45 2011
committer bradnelson@google.com <bradnelson@google.com@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Tue Mar 29 00:06:45 2011
tree dc7cca270b6508a2a54b81f6d703dd5822a5aef9
parent b7cdb9ae2925419b6cee99c545235046965f68d7

Fixing icu to work with msvs2010.

BUG=None
TEST=None
R=jeanluc@chromium.org
Review URL: http://codereview.chromium.org/6760010

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/icu46@79636 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

README.chromium

diff --git a/README.chromium b/README.chromium
index 1c67a50..6a79320 100644
--- a/README.chromium
+++ b/README.chromium
@@ -137,3 +137,16 @@
    source/common/unicode ==> public/common/unicode
    source/i18n/unicode   ==> public/i18n/unicode
 
+12. Fix for msvs2010 applied:
+--- D:/src/ent/src/third_party/icu/source/common/stringpiece.cpp
+ (revision 78292)
++++ D:/src/ent/src/third_party/icu/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 > 1500)) && !defined(CYGWINMSVC)
++#if (!defined(_MSC_VER) || (_MSC_VER > 1600)) && !defined(CYGWINMSVC)
+ const int32_t StringPiece::npos;
+ #endif

source/common/stringpiece.cpp

diff --git a/source/common/stringpiece.cpp b/source/common/stringpiece.cpp
index 64cd376..ad987a9 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 > 1500)) && !defined(CYGWINMSVC)
+#if (!defined(_MSC_VER) || (_MSC_VER > 1600)) && !defined(CYGWINMSVC)
 const int32_t StringPiece::npos;
 #endif