| Index: source/common/unicode/urename.h
 | 
| diff --git a/source/common/unicode/urename.h b/source/common/unicode/urename.h
 | 
| index 89becca7826836e688b155eb07fef43e202c3c2f..4a68f943b87774620352a69e983314ced6fdfb36 100644
 | 
| --- a/source/common/unicode/urename.h
 | 
| +++ b/source/common/unicode/urename.h
 | 
| @@ -1,6 +1,6 @@
 | 
|  /*
 | 
|  *******************************************************************************
 | 
| -*   Copyright (C) 2002-2014, International Business Machines
 | 
| +*   Copyright (C) 2002-2015, International Business Machines
 | 
|  *   Corporation and others.  All Rights Reserved.
 | 
|  *******************************************************************************
 | 
|  *
 | 
| @@ -73,14 +73,12 @@
 | 
|  #define UDataMemory_setData U_ICU_ENTRY_POINT_RENAME(UDataMemory_setData)
 | 
|  #define UDatamemory_assign U_ICU_ENTRY_POINT_RENAME(UDatamemory_assign)
 | 
|  #define _ASCIIData U_ICU_ENTRY_POINT_RENAME(_ASCIIData)
 | 
| -#if !UCONFIG_NO_NON_HTML5_CONVERSION
 | 
|  #define _Bocu1Data U_ICU_ENTRY_POINT_RENAME(_Bocu1Data)
 | 
|  #define _CESU8Data U_ICU_ENTRY_POINT_RENAME(_CESU8Data)
 | 
|  #define _CompoundTextData U_ICU_ENTRY_POINT_RENAME(_CompoundTextData)
 | 
|  #define _HZData U_ICU_ENTRY_POINT_RENAME(_HZData)
 | 
|  #define _IMAPData U_ICU_ENTRY_POINT_RENAME(_IMAPData)
 | 
|  #define _ISCIIData U_ICU_ENTRY_POINT_RENAME(_ISCIIData)
 | 
| -#endif
 | 
|  #define _ISO2022Data U_ICU_ENTRY_POINT_RENAME(_ISO2022Data)
 | 
|  #define _LMBCSData1 U_ICU_ENTRY_POINT_RENAME(_LMBCSData1)
 | 
|  #define _LMBCSData11 U_ICU_ENTRY_POINT_RENAME(_LMBCSData11)
 | 
| @@ -96,21 +94,16 @@
 | 
|  #define _LMBCSData8 U_ICU_ENTRY_POINT_RENAME(_LMBCSData8)
 | 
|  #define _Latin1Data U_ICU_ENTRY_POINT_RENAME(_Latin1Data)
 | 
|  #define _MBCSData U_ICU_ENTRY_POINT_RENAME(_MBCSData)
 | 
| -#if !UCONFIG_NO_NON_HTML5_CONVERSION
 | 
|  #define _SCSUData U_ICU_ENTRY_POINT_RENAME(_SCSUData)
 | 
| -#endif
 | 
|  #define _UTF16BEData U_ICU_ENTRY_POINT_RENAME(_UTF16BEData)
 | 
|  #define _UTF16Data U_ICU_ENTRY_POINT_RENAME(_UTF16Data)
 | 
|  #define _UTF16LEData U_ICU_ENTRY_POINT_RENAME(_UTF16LEData)
 | 
|  #define _UTF32BEData U_ICU_ENTRY_POINT_RENAME(_UTF32BEData)
 | 
|  #define _UTF32Data U_ICU_ENTRY_POINT_RENAME(_UTF32Data)
 | 
|  #define _UTF32LEData U_ICU_ENTRY_POINT_RENAME(_UTF32LEData)
 | 
| -#if !UCONFIG_NO_NON_HTML5_CONVERSION
 | 
|  #define _UTF7Data U_ICU_ENTRY_POINT_RENAME(_UTF7Data)
 | 
| -#endif
 | 
|  #define _UTF8Data U_ICU_ENTRY_POINT_RENAME(_UTF8Data)
 | 
|  #define cmemory_cleanup U_ICU_ENTRY_POINT_RENAME(cmemory_cleanup)
 | 
| -#define cmemory_inUse U_ICU_ENTRY_POINT_RENAME(cmemory_inUse)
 | 
|  #define gTimeZoneFilesInitOnce U_ICU_ENTRY_POINT_RENAME(gTimeZoneFilesInitOnce)
 | 
|  #define izrule_clone U_ICU_ENTRY_POINT_RENAME(izrule_clone)
 | 
|  #define izrule_close U_ICU_ENTRY_POINT_RENAME(izrule_close)
 | 
| @@ -210,6 +203,7 @@
 | 
|  #define u_UCharsToChars U_ICU_ENTRY_POINT_RENAME(u_UCharsToChars)
 | 
|  #define u_austrcpy U_ICU_ENTRY_POINT_RENAME(u_austrcpy)
 | 
|  #define u_austrncpy U_ICU_ENTRY_POINT_RENAME(u_austrncpy)
 | 
| +#define u_caseInsensitivePrefixMatch U_ICU_ENTRY_POINT_RENAME(u_caseInsensitivePrefixMatch)
 | 
|  #define u_catclose U_ICU_ENTRY_POINT_RENAME(u_catclose)
 | 
|  #define u_catgets U_ICU_ENTRY_POINT_RENAME(u_catgets)
 | 
|  #define u_catopen U_ICU_ENTRY_POINT_RENAME(u_catopen)
 | 
| @@ -807,6 +801,9 @@
 | 
|  #define udat_countAvailable U_ICU_ENTRY_POINT_RENAME(udat_countAvailable)
 | 
|  #define udat_countSymbols U_ICU_ENTRY_POINT_RENAME(udat_countSymbols)
 | 
|  #define udat_format U_ICU_ENTRY_POINT_RENAME(udat_format)
 | 
| +#define udat_formatCalendar U_ICU_ENTRY_POINT_RENAME(udat_formatCalendar)
 | 
| +#define udat_formatCalendarForFields U_ICU_ENTRY_POINT_RENAME(udat_formatCalendarForFields)
 | 
| +#define udat_formatForFields U_ICU_ENTRY_POINT_RENAME(udat_formatForFields)
 | 
|  #define udat_get2DigitYearStart U_ICU_ENTRY_POINT_RENAME(udat_get2DigitYearStart)
 | 
|  #define udat_getAvailable U_ICU_ENTRY_POINT_RENAME(udat_getAvailable)
 | 
|  #define udat_getBooleanAttribute U_ICU_ENTRY_POINT_RENAME(udat_getBooleanAttribute)
 | 
| @@ -890,6 +887,9 @@
 | 
|  #define uenum_reset U_ICU_ENTRY_POINT_RENAME(uenum_reset)
 | 
|  #define uenum_unext U_ICU_ENTRY_POINT_RENAME(uenum_unext)
 | 
|  #define uenum_unextDefault U_ICU_ENTRY_POINT_RENAME(uenum_unextDefault)
 | 
| +#define ufieldpositer_close U_ICU_ENTRY_POINT_RENAME(ufieldpositer_close)
 | 
| +#define ufieldpositer_next U_ICU_ENTRY_POINT_RENAME(ufieldpositer_next)
 | 
| +#define ufieldpositer_open U_ICU_ENTRY_POINT_RENAME(ufieldpositer_open)
 | 
|  #define ufile_close_translit U_ICU_ENTRY_POINT_RENAME(ufile_close_translit)
 | 
|  #define ufile_fill_uchar_buffer U_ICU_ENTRY_POINT_RENAME(ufile_fill_uchar_buffer)
 | 
|  #define ufile_flush_io U_ICU_ENTRY_POINT_RENAME(ufile_flush_io)
 | 
| @@ -1015,6 +1015,9 @@
 | 
|  #define ulist_next_keyword_value U_ICU_ENTRY_POINT_RENAME(ulist_next_keyword_value)
 | 
|  #define ulist_resetList U_ICU_ENTRY_POINT_RENAME(ulist_resetList)
 | 
|  #define ulist_reset_keyword_values_iterator U_ICU_ENTRY_POINT_RENAME(ulist_reset_keyword_values_iterator)
 | 
| +#define ulistfmt_close U_ICU_ENTRY_POINT_RENAME(ulistfmt_close)
 | 
| +#define ulistfmt_format U_ICU_ENTRY_POINT_RENAME(ulistfmt_format)
 | 
| +#define ulistfmt_open U_ICU_ENTRY_POINT_RENAME(ulistfmt_open)
 | 
|  #define uloc_acceptLanguage U_ICU_ENTRY_POINT_RENAME(uloc_acceptLanguage)
 | 
|  #define uloc_acceptLanguageFromHTTP U_ICU_ENTRY_POINT_RENAME(uloc_acceptLanguageFromHTTP)
 | 
|  #define uloc_addLikelySubtags U_ICU_ENTRY_POINT_RENAME(uloc_addLikelySubtags)
 | 
| @@ -1385,8 +1388,9 @@
 | 
|  #define uregex_getUText U_ICU_ENTRY_POINT_RENAME(uregex_getUText)
 | 
|  #define uregex_group U_ICU_ENTRY_POINT_RENAME(uregex_group)
 | 
|  #define uregex_groupCount U_ICU_ENTRY_POINT_RENAME(uregex_groupCount)
 | 
| +#define uregex_groupNumberFromCName U_ICU_ENTRY_POINT_RENAME(uregex_groupNumberFromCName)
 | 
| +#define uregex_groupNumberFromName U_ICU_ENTRY_POINT_RENAME(uregex_groupNumberFromName)
 | 
|  #define uregex_groupUText U_ICU_ENTRY_POINT_RENAME(uregex_groupUText)
 | 
| -#define uregex_groupUTextDeep U_ICU_ENTRY_POINT_RENAME(uregex_groupUTextDeep)
 | 
|  #define uregex_hasAnchoringBounds U_ICU_ENTRY_POINT_RENAME(uregex_hasAnchoringBounds)
 | 
|  #define uregex_hasTransparentBounds U_ICU_ENTRY_POINT_RENAME(uregex_hasTransparentBounds)
 | 
|  #define uregex_hitEnd U_ICU_ENTRY_POINT_RENAME(uregex_hitEnd)
 | 
| @@ -1481,6 +1485,7 @@
 | 
|  #define ures_openAvailableLocales U_ICU_ENTRY_POINT_RENAME(ures_openAvailableLocales)
 | 
|  #define ures_openDirect U_ICU_ENTRY_POINT_RENAME(ures_openDirect)
 | 
|  #define ures_openFillIn U_ICU_ENTRY_POINT_RENAME(ures_openFillIn)
 | 
| +#define ures_openNoDefault U_ICU_ENTRY_POINT_RENAME(ures_openNoDefault)
 | 
|  #define ures_openU U_ICU_ENTRY_POINT_RENAME(ures_openU)
 | 
|  #define ures_resetIterator U_ICU_ENTRY_POINT_RENAME(ures_resetIterator)
 | 
|  #define ures_swap U_ICU_ENTRY_POINT_RENAME(ures_swap)
 | 
| @@ -1608,6 +1613,7 @@
 | 
|  #define uspoof_getSkeleton U_ICU_ENTRY_POINT_RENAME(uspoof_getSkeleton)
 | 
|  #define uspoof_getSkeletonUTF8 U_ICU_ENTRY_POINT_RENAME(uspoof_getSkeletonUTF8)
 | 
|  #define uspoof_getSkeletonUnicodeString U_ICU_ENTRY_POINT_RENAME(uspoof_getSkeletonUnicodeString)
 | 
| +#define uspoof_internalInitStatics U_ICU_ENTRY_POINT_RENAME(uspoof_internalInitStatics)
 | 
|  #define uspoof_open U_ICU_ENTRY_POINT_RENAME(uspoof_open)
 | 
|  #define uspoof_openFromSerialized U_ICU_ENTRY_POINT_RENAME(uspoof_openFromSerialized)
 | 
|  #define uspoof_openFromSource U_ICU_ENTRY_POINT_RENAME(uspoof_openFromSource)
 | 
| 
 |