AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-12647 Fix build break on Windows.

Browse Source 
('IN' is already defined in a Windows header, so it conflicts with the variable IN.)

X-SVN-Rev: 40925
This commit is contained in:
Jeff Genovy 2018-02-15 22:37:22 +00:00
parent 8ccca58d0c
commit 4298f41e35
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/i18n/regexcmp.cpp
View File

@ -4450,11 +4450,11 @@ UnicodeSet *RegexCompile::createSetForProperty(const UnicodeString &propName, UB
// See if the property looks like a Java "InBlockName", which
// we will recast as "Block=BlockName"
//
static const UChar IN[] = {0x49, 0x6E, 0}; // "In"
static const UChar BLOCK[] = {0x42, 0x6C, 0x6f, 0x63, 0x6b, 0x3d, 00}; // "Block="
if (mPropName.startsWith(IN, 2) && propName.length()>=3) {
static const UChar strIN[] = {0x49, 0x6E, 0}; // "In"
static const UChar strBLOCK[] = {0x42, 0x6C, 0x6f, 0x63, 0x6b, 0x3d, 00}; // "Block="
if (mPropName.startsWith(strIN, 2) && propName.length()>=3) {
setExpr.truncate(4); // Leaves "[\p{", or "[\P{"
setExpr.append(BLOCK, -1);
setExpr.append(strBLOCK, -1);
setExpr.append(UnicodeString(mPropName, 2)); // Property with the leading "In" removed.
setExpr.append(chRBrace);
setExpr.append(chRBracket);