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-1075 Fix some name possible function name collisions of exported functions

Browse source 
X-SVN-Rev: 6092
This commit is contained in:
George Rhoten 2001-10-05 21:48:05 +00:00
parent aa41dc7f71
commit 8c5742dded
5 changed files with 11 additions and 11 deletions

10
icu4c/source/common/ucmndata.c
View file

@ -143,10 +143,10 @@ static const DataHeader *pointerTOCLookupFn(const UDataMemory *pData,
/* found it */
#ifdef UDATA_DEBUG
fprintf(stderr, "FOUND: %p\n",
normalizeDataPointer(toc[start].pHeader));
UDataMemory_normalizeDataPointer(toc[start].pHeader));
#endif
return normalizeDataPointer(toc[start].pHeader);
return UDataMemory_normalizeDataPointer(toc[start].pHeader);
} else {
#ifdef UDATA_DEBUG
fprintf(stderr, "NOT found\n");
@ -161,8 +161,8 @@ static const DataHeader *pointerTOCLookupFn(const UDataMemory *pData,
}
}
static commonDataFuncs CmnDFuncs = {offsetTOCLookupFn, offsetTOCEntryCount};
static commonDataFuncs ToCPFuncs = {pointerTOCLookupFn, pointerTOCEntryCount};
static const commonDataFuncs CmnDFuncs = {offsetTOCLookupFn, offsetTOCEntryCount};
static const commonDataFuncs ToCPFuncs = {pointerTOCLookupFn, pointerTOCEntryCount};
@ -174,7 +174,7 @@ static commonDataFuncs ToCPFuncs = {pointerTOCLookupFn, pointerTOCEntryCount};
* and set the appropriate error code. *
* *
*----------------------------------------------------------------------*/
void checkCommonData(UDataMemory *udm, UErrorCode *err) {
void udata_checkCommonData(UDataMemory *udm, UErrorCode *err) {
if (U_FAILURE(*err)) {
return;
}

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

@ -75,7 +75,7 @@ typedef struct {
* otherwise
* set an errorcode.
*/
void checkCommonData(UDataMemory *pData, UErrorCode *pErrorCode);
void udata_checkCommonData(UDataMemory *pData, UErrorCode *pErrorCode);
#endif

4
icu4c/source/common/udatamem.c
View file

@ -55,7 +55,7 @@ UDataMemory *UDataMemory_createNewInstance(UErrorCode *pErr) {
const DataHeader *
normalizeDataPointer(const void *p) {
UDataMemory_normalizeDataPointer(const void *p) {
/* allow the data to be optionally prepended with an alignment-forcing double value */
const DataHeader *pdh = (const DataHeader *)p;
if(pdh==NULL || (pdh->dataHeader.magic1==0xda && pdh->dataHeader.magic2==0x27)) {
@ -67,7 +67,7 @@ normalizeDataPointer(const void *p) {
void UDataMemory_setData (UDataMemory *This, const void *dataAddr) {
This->pHeader = normalizeDataPointer(dataAddr);
This->pHeader = UDataMemory_normalizeDataPointer(dataAddr);
}

4
icu4c/source/common/udatamem.h
View file

@ -23,7 +23,7 @@
#include "ucmndata.h"
struct UDataMemory {
commonDataFuncs *vFuncs; /* Function Pointers for accessing TOC */
const commonDataFuncs *vFuncs; /* Function Pointers for accessing TOC */
const DataHeader *pHeader; /* Header of the memory being described by this */
/* UDataMemory object. */
@ -48,6 +48,6 @@ UBool UDataMemory_isLoaded(UDataMemory *This);
void UDataMemory_setData (UDataMemory *This, const void *dataAddr);
const DataHeader *normalizeDataPointer(const void *p);
const DataHeader *UDataMemory_normalizeDataPointer(const void *p);
#endif

2
icu4c/source/common/umapfile.c
View file

@ -352,7 +352,7 @@ static int dlclose(void *handle) {
*basename=0;
}
checkCommonData(&tData, pErrorCode);
udata_checkCommonData(&tData, pErrorCode);
if (U_SUCCESS(*pErrorCode)) {
/* Don't close the old data - someone might be using it
* May need to change the global to be a pointer rather than a static struct