From: Michael Ow Date: Fri, 24 Aug 2012 15:29:03 +0000 (+0000) Subject: ICU-9353 Fix redefinition error in dictionarydata when building with Cygwin MSVC X-Git-Tag: milestone-59-0-1~3643 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f41905b0b368d9c5e8afa8688f2e31eddb729b6;p=icu ICU-9353 Fix redefinition error in dictionarydata when building with Cygwin MSVC X-SVN-Rev: 32224 --- diff --git a/icu4c/source/common/dictionarydata.cpp b/icu4c/source/common/dictionarydata.cpp index 8fdb2dc1cab..e9ec12edc2b 100644 --- a/icu4c/source/common/dictionarydata.cpp +++ b/icu4c/source/common/dictionarydata.cpp @@ -17,8 +17,10 @@ U_NAMESPACE_BEGIN +#ifndef CYGWINMSVC /* On Cygwin/MSVC, the error redefinition of symbols occurs.*/ const int32_t DictionaryData::TRIE_TYPE_BYTES; const int32_t DictionaryData::TRIE_TYPE_UCHARS; +#endif UCharsDictionaryMatcher::~UCharsDictionaryMatcher() { udata_close(file);