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

ICU-7261 update urename.h (and add some statics in ushape.c)

Browse Source 
X-SVN-Rev: 27466
This commit is contained in:
Steven R. Loomis 2010-02-01 23:10:11 +00:00
parent 7474af9d2d
commit b21f47bdb7
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
icu4c/source/common/unicode/urename.h
View File

@ -102,8 +102,6 @@
#define _UTF32LEData U_ICU_ENTRY_POINT_RENAME(_UTF32LEData)
#define _UTF7Data U_ICU_ENTRY_POINT_RENAME(_UTF7Data)
#define _UTF8Data U_ICU_ENTRY_POINT_RENAME(_UTF8Data)
#define _fini U_ICU_ENTRY_POINT_RENAME(_fini)
#define _init U_ICU_ENTRY_POINT_RENAME(_init)
#define bms_close U_ICU_ENTRY_POINT_RENAME(bms_close)
#define bms_empty U_ICU_ENTRY_POINT_RENAME(bms_empty)
#define bms_getData U_ICU_ENTRY_POINT_RENAME(bms_getData)
@ -143,9 +141,6 @@
#define le_getGlyphs U_ICU_ENTRY_POINT_RENAME(le_getGlyphs)
#define le_layoutChars U_ICU_ENTRY_POINT_RENAME(le_layoutChars)
#define le_reset U_ICU_ENTRY_POINT_RENAME(le_reset)
#define libraryCount U_ICU_ENTRY_POINT_RENAME(libraryCount)
#define libraryList U_ICU_ENTRY_POINT_RENAME(libraryList)
#define libraryMax U_ICU_ENTRY_POINT_RENAME(libraryMax)
#define locale_getKeywords U_ICU_ENTRY_POINT_RENAME(locale_getKeywords)
#define locale_get_default U_ICU_ENTRY_POINT_RENAME(locale_get_default)
#define locale_set_default U_ICU_ENTRY_POINT_RENAME(locale_set_default)
@ -202,8 +197,6 @@
#define pl_resetFontRuns U_ICU_ENTRY_POINT_RENAME(pl_resetFontRuns)
#define pl_resetLocaleRuns U_ICU_ENTRY_POINT_RENAME(pl_resetLocaleRuns)
#define pl_resetValueRuns U_ICU_ENTRY_POINT_RENAME(pl_resetValueRuns)
#define pluginCount U_ICU_ENTRY_POINT_RENAME(pluginCount)
#define pluginList U_ICU_ENTRY_POINT_RENAME(pluginList)
#define res_countArrayItems U_ICU_ENTRY_POINT_RENAME(res_countArrayItems)
#define res_findResource U_ICU_ENTRY_POINT_RENAME(res_findResource)
#define res_getAlias U_ICU_ENTRY_POINT_RENAME(res_getAlias)
@ -218,14 +211,7 @@
#define res_load U_ICU_ENTRY_POINT_RENAME(res_load)
#define res_read U_ICU_ENTRY_POINT_RENAME(res_read)
#define res_unload U_ICU_ENTRY_POINT_RENAME(res_unload)
#define spacesRelativeToTextBeginEnd U_ICU_ENTRY_POINT_RENAME(spacesRelativeToTextBeginEnd)
#define staticLibraryList U_ICU_ENTRY_POINT_RENAME(staticLibraryList)
#define tailChar U_ICU_ENTRY_POINT_RENAME(tailChar)
#define triedict_swap U_ICU_ENTRY_POINT_RENAME(triedict_swap)
#define uShapeLamalefBegin U_ICU_ENTRY_POINT_RENAME(uShapeLamalefBegin)
#define uShapeLamalefEnd U_ICU_ENTRY_POINT_RENAME(uShapeLamalefEnd)
#define uShapeTashkeelBegin U_ICU_ENTRY_POINT_RENAME(uShapeTashkeelBegin)
#define uShapeTashkeelEnd U_ICU_ENTRY_POINT_RENAME(uShapeTashkeelEnd)
#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)
@ -1697,6 +1683,8 @@
#define ztrans_setFrom U_ICU_ENTRY_POINT_RENAME(ztrans_setFrom)
#define ztrans_setTime U_ICU_ENTRY_POINT_RENAME(ztrans_setTime)
#define ztrans_setTo U_ICU_ENTRY_POINT_RENAME(ztrans_setTo)
/* C++ class names renaming defines */
#ifdef XP_CPLUSPLUS

12
icu4c/source/common/ushape.c
View File

@ -76,12 +76,12 @@
#define SHAPE_MODE 0
#define DESHAPE_MODE 1
UChar tailChar = OLD_TAIL_CHAR;
uint32_t uShapeLamalefBegin = U_SHAPE_LAMALEF_BEGIN;
uint32_t uShapeLamalefEnd = U_SHAPE_LAMALEF_END;
uint32_t uShapeTashkeelBegin = U_SHAPE_TASHKEEL_BEGIN;
uint32_t uShapeTashkeelEnd = U_SHAPE_TASHKEEL_END;
int spacesRelativeToTextBeginEnd = 0;
static UChar tailChar = OLD_TAIL_CHAR;
static uint32_t uShapeLamalefBegin = U_SHAPE_LAMALEF_BEGIN;
static uint32_t uShapeLamalefEnd = U_SHAPE_LAMALEF_END;
static uint32_t uShapeTashkeelBegin = U_SHAPE_TASHKEEL_BEGIN;
static uint32_t uShapeTashkeelEnd = U_SHAPE_TASHKEEL_END;
static int spacesRelativeToTextBeginEnd = 0;
static const uint8_t tailFamilyIsolatedFinal[] = {
/* FEB1 */ 1,

3
icu4c/source/tools/genren/genren.pl
View File

@ -181,6 +181,8 @@ for(;@ARGV; shift(@ARGV)) {
print STDERR "$ARGV[0]: Not sure what to do with '$_'\n";
} elsif ( /^_init/ ) {
&verbose( "$ARGV[0]: Skipped initializer $_\n" );
} elsif ( /^_fini/ ) {
&verbose( "$ARGV[0]: Skipped finilizer $_\n" );
} elsif ( /icu_/) {
print STDERR "$ARGV[0]: Skipped strange mangled function $_\n";
} elsif ( /^vtable for /) {
@ -217,6 +219,7 @@ foreach(sort keys(%CFuncs)) {
# print HEADER "#define $_ $_$U_ICU_VERSION_SUFFIX\n";
}
print HEADER "\n\n";
print HEADER "/* C++ class names renaming defines */\n\n";
print HEADER "#ifdef XP_CPLUSPLUS\n";
print HEADER "#if !U_HAVE_NAMESPACE\n\n";