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

ICU-5282 Don't test for UCONFIG_NO_CONVERSION. It shouldn't normally work.

Browse Source 
X-SVN-Rev: 19963
This commit is contained in:
George Rhoten 2006-08-02 22:29:50 +00:00
parent 885b57fdb6
commit 77d118a8a5
8 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/test/intltest/csdetest.cpp
View File

@ -471,7 +471,7 @@ bail:
void CharsetDetectionTest::DetectionTest()
{
#if !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_CONVERSION
#if !UCONFIG_NO_REGULAR_EXPRESSIONS
UErrorCode status = U_ZERO_ERROR;
char path[2048];
const char *testFilePath = getPath(path, "csdetest.xml");

2
icu4c/source/test/letest/letest.cpp
View File

@ -537,7 +537,7 @@ LEFontInstance *openFont(const char *fontName, const char *checksum, const char
U_CDECL_BEGIN
static void U_CALLCONV DataDrivenTest(void)
{
#if !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_CONVERSION
#if !UCONFIG_NO_REGULAR_EXPRESSIONS
UErrorCode status = U_ZERO_ERROR;
char path[2048];
const char *testFilePath = getPath(path, "letest.xml");

2
icu4c/source/tools/makeconv/gencnvex.c
View File

@ -29,7 +29,6 @@
#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
#if !UCONFIG_NO_CONVERSION
static void
CnvExtClose(NewConverter *cnvData);
@ -1060,4 +1059,3 @@ CnvExtAddTable(NewConverter *cnvData, UCMTable *table, UConverterStaticData *sta
makeFromUTable(extData, table);
}
#endif /* UCONFIG_NO_CONVERSION */

2
icu4c/source/tools/makeconv/genmbcs.c
View File

@ -25,7 +25,6 @@
#include "makeconv.h"
#include "genmbcs.h"
#if !UCONFIG_NO_CONVERSION
typedef struct MBCSData {
NewConverter newConverter;
@ -1101,4 +1100,3 @@ MBCSWrite(NewConverter *cnvData, const UConverterStaticData *staticData,
return header.offsetFromUBytes+header.fromUBytesLength;
}
#endif /* UCONFIG_NO_CONVERSION */

4
icu4c/source/tools/makeconv/genmbcs.h
View File

@ -19,8 +19,6 @@
#include "makeconv.h"
#if !UCONFIG_NO_CONVERSION
enum {
MBCS_STAGE_2_BLOCK_SIZE=0x40, /* 64; 64=1<<6 for 6 bits in stage 2 */
MBCS_STAGE_2_BLOCK_SIZE_SHIFT=6, /* log2(MBCS_STAGE_2_BLOCK_SIZE) */
@ -44,6 +42,4 @@ MBCSOpen(UCMFile *ucm);
U_CFUNC NewConverter *
CnvExtOpen(UCMFile *ucm);
#endif /* UCONFIG_NO_CONVERSION */
#endif /* __GENMBCS_H__ */

8
icu4c/source/tools/makeconv/makeconv.c
View File

@ -36,7 +36,6 @@
#define DEBUG 0
#if !UCONFIG_NO_CONVERSION
typedef struct ConvData {
UCMFile *ucm;
@ -740,13 +739,6 @@ createConverter(ConvData *data, const char *converterName, UErrorCode *pErrorCod
cleanupConvData(&baseData);
}
}
#else
int main(int argc, char *argv[])
{
printf("Your version of ICU was built without conversion,\n");
printf("so this tool has no functionality.\n");
}
#endif
/*
* Hey, Emacs, please set the following:

2
icu4c/source/tools/makeconv/makeconv.h
View File

@ -22,7 +22,6 @@
#include "unewdata.h"
#include "ucm.h"
#if !UCONFIG_NO_CONVERSION
/* exports from makeconv.c */
U_CFUNC UBool VERBOSE;
@ -54,6 +53,5 @@ struct NewConverter {
(*write)(NewConverter *cnvData, const UConverterStaticData *staticData,
UNewDataMemory *pData, int32_t tableType);
};
#endif /* UCONFIG_NO_CONVERSION */
#endif /* __MAKECONV_H__ */

2
icu4c/source/tools/makeconv/ucnvstat.c
View File

@ -15,7 +15,6 @@
#include "unicode/ucnv.h"
#include "ucnv_bld.h"
#if !UCONFIG_NO_CONVERSION
static const UConverterStaticData _SBCSStaticData={
sizeof(UConverterStaticData),
@ -66,4 +65,3 @@ const UConverterStaticData *ucnv_converterStaticData[UCNV_NUMBER_OF_SUPPORTED_CO
/* LMBCS */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
};
#endif /* UCONFIG_NO_CONVERSION */