organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-739 Palm OS compiler has some issues with shared libraries and exported data (non-functions).

Browse source 
X-SVN-Rev: 17304
This commit is contained in:
George Rhoten 2005-03-09 05:48:19 +00:00
parent cdf4eef48c
commit 933ce2197f
4 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4c/source/i18n/calendar.cpp
View file

@ -144,9 +144,9 @@ static void getCalendarKeyword(const UnicodeString &id, char *targetBuffer, int3
int32_t keywordIdx = id.indexOf((UChar)0x003D); /* '=' */
if (id[0] == 0x40/*'@'*/
&& id.compareBetween(1, calKeyLen+1, calendarKeyword, 0, calKeyLen) == 0)
&& id.compareBetween(1, keywordIdx+1, calendarKeyword, 0, calKeyLen) == 0)
{
keyLen = id.extract(calKeyLen+1, id.length(), targetBuffer, targetBufferSize, US_INV);
keyLen = id.extract(keywordIdx+1, id.length(), targetBuffer, targetBufferSize, US_INV);
}
targetBuffer[keyLen] = 0;
}
@ -449,7 +449,7 @@ static const int32_t kCalendarLimits[UCAL_FIELD_COUNT][4] = {
};
// Resource bundle tags read by this class
const char Calendar::kDateTimeElements[] = "DateTimeElements";
static const char gDateTimeElements[] = "DateTimeElements";
// Data flow in Calendar
// ---------------------
@ -2985,7 +2985,7 @@ Calendar::setWeekCountData(const Locale& desiredLocale, const char *type, UError
CalendarData calData(desiredLocale, type, status);
// If the resource data doesn't seem to be present at all, then use last-resort
// hard-coded data.
UResourceBundle *dateTimeElements = calData.getByKey(kDateTimeElements, status);
UResourceBundle *dateTimeElements = calData.getByKey(gDateTimeElements, status);
if (U_FAILURE(status))
{

5
icu4c/source/i18n/coleitr.cpp
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2003, International Business Machines Corporation and *
* Copyright (C) 1996-2005, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -40,9 +40,6 @@ U_NAMESPACE_BEGIN
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CollationElementIterator)
/* synwee : public can't remove */
int32_t const CollationElementIterator::NULLORDER = 0xffffffff;
/* CollationElementIterator public constructor/destructor ------------------ */
CollationElementIterator::CollationElementIterator(

13
icu4c/source/i18n/unicode/calendar.h
View file

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2004, International Business Machines
* Copyright (C) 1997-2005, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -1896,17 +1896,6 @@ private:
*/
void updateTime(UErrorCode& status);
/**
* The resource tag for the resource where the week-count data is stored.
*/
static const char kDateTimeElements[];
/**
* The resource tag where the default calendar is stored.
*/
static const char kDefaultCalendar[];
/**
* The Gregorian year, as computed by computeGregorianFields() and
* returned by getGregorianYear().

6
icu4c/source/i18n/unicode/coleitr.h
View file

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 1997-2004, International Business Machines
* Copyright (C) 1997-2005, International Business Machines
* Corporation and others. All Rights Reserved.
******************************************************************************
*/
@ -127,7 +127,9 @@ public:
* NULLORDER indicates that an error has occured while processing
* @stable ICU 2.0
*/
static int32_t const NULLORDER;
enum {
NULLORDER = (int32_t)0xffffffff
};
// CollationElementIterator public constructor/destructor -------------------