diff --git a/icu4c/source/common/propname_data.h b/icu4c/source/common/propname_data.h index 20caa9aff4f..1fd8a466652 100644 --- a/icu4c/source/common/propname_data.h +++ b/icu4c/source/common/propname_data.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2011, International Business Machines + * Copyright (C) 1999-2012, International Business Machines * Corporation and others. All Rights Reserved. * * file name: propname_data.h diff --git a/icu4c/source/common/ubidi_props_data.h b/icu4c/source/common/ubidi_props_data.h index 748adcdb5ef..4fa1e7875f7 100644 --- a/icu4c/source/common/ubidi_props_data.h +++ b/icu4c/source/common/ubidi_props_data.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2011, International Business Machines + * Copyright (C) 1999-2012, International Business Machines * Corporation and others. All Rights Reserved. * * file name: ubidi_props_data.h diff --git a/icu4c/source/common/uchar_props_data.h b/icu4c/source/common/uchar_props_data.h index 8e195e7a9fd..94aede34292 100644 --- a/icu4c/source/common/uchar_props_data.h +++ b/icu4c/source/common/uchar_props_data.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2011, International Business Machines + * Copyright (C) 1999-2012, International Business Machines * Corporation and others. All Rights Reserved. * * file name: uchar_props_data.h diff --git a/icu4c/source/data/in/unames.icu b/icu4c/source/data/in/unames.icu index 44ed175a54c..8204f1d2d06 100644 Binary files a/icu4c/source/data/in/unames.icu and b/icu4c/source/data/in/unames.icu differ diff --git a/icu4c/source/tools/toolutil/ppucd.cpp b/icu4c/source/tools/toolutil/ppucd.cpp index 320e38add4a..852a5b2ae3d 100644 --- a/icu4c/source/tools/toolutil/ppucd.cpp +++ b/icu4c/source/tools/toolutil/ppucd.cpp @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 2011, International Business Machines +* Copyright (C) 2011-2012, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * file name: ppucd.cpp @@ -411,7 +411,7 @@ PreparsedUCD::parseProperty(UniProps &props, const char *field, UnicodeSet &newV UBool PreparsedUCD::getRangeForAlgNames(UChar32 &start, UChar32 &end, UErrorCode &errorCode) { - if(U_FAILURE(errorCode)) { return NULL; } + if(U_FAILURE(errorCode)) { return FALSE; } if(lineType!=ALG_NAMES_RANGE_LINE) { errorCode=U_ILLEGAL_ARGUMENT_ERROR; return FALSE; diff --git a/icu4c/source/tools/toolutil/ppucd.h b/icu4c/source/tools/toolutil/ppucd.h index f7d22c70909..071cb73de06 100644 --- a/icu4c/source/tools/toolutil/ppucd.h +++ b/icu4c/source/tools/toolutil/ppucd.h @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 2011, International Business Machines +* Copyright (C) 2011-2012, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * file name: ppucd.h @@ -24,7 +24,7 @@ /** Additions to the uchar.h enum UProperty. */ enum { /** Name_Alias */ - PPUCD_NAME_ALIAS=UCHAR_OTHER_PROPERTY_LIMIT + PPUCD_NAME_ALIAS=UCHAR_STRING_LIMIT }; U_NAMESPACE_BEGIN