diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-14 13:44:24 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-14 13:44:24 +0100 |
| commit | ed9b67df359953dcaff448c6db25cbc73ddafd46 (patch) | |
| tree | bfc32f632a5ffe03d9d27681bfe5b48a774eff5f /icu | |
| parent | 16aa53366937621342496b5532f5747c4119a899 (diff) | |
Dupplicate symbol in Windows build
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-build.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index 7fa5e8e58cb7..cedd2807e8a3 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -115,3 +115,14 @@ if ((t & MASK_TRANSPARENT) != 0) { continue; +--- icu/source/common/stringpiece.cpp 2010-10-29 20:01:01.000000000 +0200 ++++ icu.new/source/common/stringpiece.cpp 2011-03-14 13:38:59.094036495 +0100 +@@ -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) && !defined(CYGWINMSVC)) + const int32_t StringPiece::npos; + #endif + |