organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues1 Projects Releases Wiki Activity Actions3

ICU-8350 zOS fixes round one

Browse source 
X-SVN-Rev: 29973
This commit is contained in:
Steven R. Loomis 2011-05-03 03:40:34 +00:00
parent f8aae2e64a
commit b88cd9bca9
4 changed files with 19 additions and 16 deletions
icu4c/source
common
ucmndata.h
i18n
ucol_tok.h
test/cintltst
custrtrn.c
tools/toolutil
swapimpl.cpp

15
icu4c/source/common/ucmndata.h
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1999-2010, International Business Machines
* Copyright (C) 1999-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************/
@ -71,6 +71,7 @@ udata_getHeaderSize(const DataHeader *udh);
U_CFUNC uint16_t
udata_getInfoSize(const UDataInfo *info);
U_CDECL_BEGIN
/*
* "Virtual" functions for data lookup.
* To call one, given a UDataMemory *p, the code looks like this:
@ -79,13 +80,15 @@ udata_getInfoSize(const UDataInfo *info);
*/
typedef const DataHeader *
(* LookupFn)(const UDataMemory *pData,
const char *tocEntryName,
int32_t *pLength,
UErrorCode *pErrorCode);
(U_CALLCONV * LookupFn)(const UDataMemory *pData,
const char *tocEntryName,
int32_t *pLength,
UErrorCode *pErrorCode);
typedef uint32_t
(* NumEntriesFn)(const UDataMemory *pData);
(U_CALLCONV * NumEntriesFn)(const UDataMemory *pData);
U_CDECL_END
typedef struct {
LookupFn Lookup;

4
icu4c/source/i18n/ucol_tok.h
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2001-2010, International Business Machines
* Copyright (C) 2001-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -199,7 +199,7 @@ U_CFUNC int32_t U_EXPORT2 ucol_inv_getPrevCE(const UColTokenParser *src,
uint32_t *prevCE, uint32_t *prevContCE,
uint32_t strength);
U_CFUNC const UChar* ucol_tok_getRulesFromBundle(
const UChar* U_CALLCONV ucol_tok_getRulesFromBundle(
void* context,
const char* locale,
const char* type,

2
icu4c/source/test/cintltst/custrtrn.c
View file

@ -1455,7 +1455,7 @@ Test_WCHART_LongString(){
for(j=0;j>=0&&j<reqLen;j++) {
if(wDest[j]!=uSrc[j]) {
log_verbose("Diff %04X vs %04X @ %d\n", wDest[j],uSrc[j],j);
j=-1;
break;
}
}
}

14
icu4c/source/tools/toolutil/swapimpl.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2005-2010, International Business Machines
* Copyright (C) 2005-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -70,7 +70,7 @@
/* Unicode property (value) aliases data swapping --------------------------- */
static int32_t
static int32_t U_CALLCONV
upname_swap(const UDataSwapper *ds,
const void *inData, int32_t length, void *outData,
UErrorCode *pErrorCode) {
@ -155,7 +155,7 @@ upname_swap(const UDataSwapper *ds,
/* Unicode properties data swapping ----------------------------------------- */
static int32_t
static int32_t U_CALLCONV
uprops_swap(const UDataSwapper *ds,
const void *inData, int32_t length, void *outData,
UErrorCode *pErrorCode) {
@ -303,7 +303,7 @@ uprops_swap(const UDataSwapper *ds,
/* Unicode case mapping data swapping --------------------------------------- */
static int32_t
static int32_t U_CALLCONV
ucase_swap(const UDataSwapper *ds,
const void *inData, int32_t length, void *outData,
UErrorCode *pErrorCode) {
@ -405,7 +405,7 @@ ucase_swap(const UDataSwapper *ds,
/* Unicode bidi/shaping data swapping --------------------------------------- */
static int32_t
static int32_t U_CALLCONV
ubidi_swap(const UDataSwapper *ds,
const void *inData, int32_t length, void *outData,
UErrorCode *pErrorCode) {
@ -513,7 +513,7 @@ ubidi_swap(const UDataSwapper *ds,
#if !UCONFIG_NO_NORMALIZATION
static int32_t
static int32_t U_CALLCONV
unorm_swap(const UDataSwapper *ds,
const void *inData, int32_t length, void *outData,
UErrorCode *pErrorCode) {
@ -637,7 +637,7 @@ unorm_swap(const UDataSwapper *ds,
#endif
/* Swap 'Test' data from gentest */
static int32_t
static int32_t U_CALLCONV
test_swap(const UDataSwapper *ds,
const void *inData, int32_t length, void *outData,
UErrorCode *pErrorCode) {