organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-4620 uconfig.h failures

Browse source 
X-SVN-Rev: 18155
This commit is contained in:
Steven R. Loomis 2005-07-07 07:54:43 +00:00
parent c9a551f486
commit 9d29225514
6 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/locutil.cpp
View file

@ -8,7 +8,7 @@
*/
#include "unicode/utypes.h"
#if !UCONFIG_NO_SERVICE
#if !UCONFIG_NO_SERVICE || !UCONFIG_NO_TRANSLITERATION
#include "unicode/resbund.h"
#include "cmemory.h"

5
icu4c/source/common/locutil.h
View file

@ -12,6 +12,9 @@
#include "unicode/utypes.h"
#include "hash.h"
#if !UCONFIG_NO_SERVICE || !UCONFIG_NO_TRANSLITERATION
U_NAMESPACE_BEGIN
// temporary utility functions, till I know where to find them
@ -29,4 +32,6 @@ public:
U_NAMESPACE_END
#endif
#endif

1
icu4c/source/common/uprops.c
View file

@ -30,6 +30,7 @@
#include "unormimp.h"
#include "ubidi_props.h"
#include "uprops.h"
#include "ucase.h"
#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))

8
icu4c/source/test/intltest/intltest.cpp
View file

@ -35,6 +35,10 @@
#include "cmemory.h"
#include "uoptions.h"
#include "putilimp.h" // for uprv_getUTCtime()
#include "unicode/locid.h"
#ifdef XP_MAC_CONSOLE
#include <console.h>
#include "Files.h"
@ -983,7 +987,7 @@ main(int argc, char* argv[])
U_MAIN_INIT_ARGS(argc, argv);
startTime = Calendar::getNow();
startTime = uprv_getUTCtime();
for (int i = 1; i < argc; ++i) {
if (argv[i][0] == '-') {
@ -1222,7 +1226,7 @@ main(int argc, char* argv[])
if (execCount <= 0) {
fprintf(stdout, "***** Not all called tests actually exist! *****\n");
}
endTime = Calendar::getNow();
endTime = uprv_getUTCtime();
diffTime = (int32_t)(endTime - startTime);
printf("Elapsed Time: %02d:%02d:%02d.%03d\n",
((diffTime%U_MILLIS_PER_DAY)/U_MILLIS_PER_HOUR),

2
icu4c/source/test/intltest/strcase.cpp
View file

@ -493,6 +493,7 @@ StringCaseTest::TestCasing() {
}
delete driver;
#if !UCONFIG_NO_BREAK_ITERATION
// more tests for API coverage
status=U_ZERO_ERROR;
input=UNICODE_STRING_SIMPLE("sTrA\\u00dfE").unescape();
@ -500,4 +501,5 @@ StringCaseTest::TestCasing() {
if(result!=UNICODE_STRING_SIMPLE("Stra\\u00dfe").unescape()) {
errln("UnicodeString::toTitle(NULL) failed");
}
#endif
}

6
icu4c/source/test/intltest/uobjtest.cpp
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 2002-2004, International Business Machines Corporation and
* Copyright (c) 2002-2005, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -203,11 +203,13 @@ UObject *UObjectTest::testClass(UObject *obj,
#define UOBJTEST_TEST_INTERNALS 0 /* do NOT test Internal things - their functions aren't exported on Win32 */
#if !UCONFIG_NO_SERVICE
/* The whole purpose of this class is to expose the constructor, and gain access to the superclasses RTTI. */
class TestLocaleKeyFactory : public LocaleKeyFactory {
public:
TestLocaleKeyFactory(int32_t coverage) : LocaleKeyFactory(coverage) {}
};
#endif
void UObjectTest::testIDs()
{
@ -215,7 +217,7 @@ void UObjectTest::testIDs()
UErrorCode status = U_ZERO_ERROR;
static const UChar SMALL_STR[] = {0x51, 0x51, 0x51, 0}; // "QQQ"
#if !UCONFIG_NO_TRANSLITERATION && !UCONFIG_NO_FORMATTING
#if !UCONFIG_NO_TRANSLITERATION || !UCONFIG_NO_FORMATTING
UParseError parseError;
#endif