From 8fc467cec54003c24df92b8493d97d3cec8b8672 Mon Sep 17 00:00:00 2001 From: Alan Liu Date: Fri, 22 Oct 1999 21:27:33 +0000 Subject: [PATCH] Redone - don't include internal headers, and only forward declare if necessary (use #ifndef) X-Trac-URL: https://ssl.icu-project.org/trac/ticket/46 git-svn-id: http://source.icu-project.org/repos/icu/icu/trunk@109 0a8b766c-62c9-45f9-954d-7f2943c9ead0 --- source/common/ucnv_bld.h | 10 ++++++++-- source/common/ucnv_imp.h | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/source/common/ucnv_bld.h b/source/common/ucnv_bld.h index 7cc2ea1100b..a5e2acf8312 100644 --- a/source/common/ucnv_bld.h +++ b/source/common/ucnv_bld.h @@ -27,12 +27,18 @@ #define UCNV_BLD_H #include "utypes.h" -#include "ucmp8.h" -#include "ucmp16.h" #define UCNV_MAX_SUBCHAR_LEN 4 #define UCNV_ERROR_BUFFER_LENGTH 20 +#ifndef UCMP16_H +typedef struct _CompactShortArray CompactShortArray; +#endif + +#ifndef UCMP8_H +typedef struct _CompactByteArray CompactByteArray; +#endif + #define UCNV_IMPLEMENTED_CONVERSION_TYPES 9 /*Sentinel Value used to check the integrity of the binary data files */ diff --git a/source/common/ucnv_imp.h b/source/common/ucnv_imp.h index 89adf4716fd..619c92b7a72 100644 --- a/source/common/ucnv_imp.h +++ b/source/common/ucnv_imp.h @@ -27,7 +27,10 @@ #define UCNV_IMP_H #include "utypes.h" -#include "uhash.h" + +#ifndef UHASH_H +typedef struct _UHashtable UHashtable; +#endif /*Hashtable used to store UConverterSharedData objects supporting *the Caching mechanism