Index: icu-2.6.patch =================================================================== RCS file: /cvs/external/icu/icu-2.6.patch,v retrieving revision 1.5 diff -u -r1.5 icu-2.6.patch --- icu-2.6.patch 12 May 2004 08:05:07 -0000 1.5 +++ icu-2.6.patch 22 Nov 2004 17:39:49 -0000 @@ -1,21 +1,5 @@ -*** misc/icu/source/icudefs.mk.in Tue Jun 3 08:44:40 2003 ---- misc/build/icu/source/icudefs.mk.in Mon May 3 10:46:50 2004 -*************** -*** 136,142 **** ---- 136,146 ---- - SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared - - # Environment variable to set a runtime search path -+ ifeq ($(OS), IRIX) -+ LDLIBRARYPATH_ENVVAR = LD_LIBRARYN32_PATH -+ else - LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH -+ endif - - # Versioned target for a shared library. - FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -*** misc/icu/source/common/unicode/rbbi.h Tue Jun 10 20:04:02 2003 ---- misc/build/icu/source/common/unicode/rbbi.h Mon May 3 10:46:50 2004 +*** misc/icu/source/common/unicode/rbbi.h Tue Jun 10 18:04:02 2003 +--- misc/build/icu/source/common/unicode/rbbi.h Sat Nov 20 23:55:37 2004 *************** *** 113,118 **** --- 113,123 ---- @@ -31,23 +15,23 @@ * Constructor from a flattened set of RBBI data in malloced memory. * RulesBasedBreakIterators built from a custom set of rules *************** -*** 125,137 **** +*** 124,136 **** + * @internal */ RuleBasedBreakIterator(RBBIDataHeader* data, UErrorCode &status); - +- - friend class RBBIRuleBuilder; /** @internal */ - friend class BreakIterator; - - - - public: -- + /** Default constructor. Creates an empty shell of an iterator, with no * rules or text to iterate over. Object can subsequently be assigned to. - * @draft ICU 2.2 ---- 130,135 ---- -*** misc/icu/source/config/mh-darwin Tue Jun 3 22:52:56 2003 ---- misc/build/icu/source/config/mh-darwin Mon May 3 10:46:50 2004 +--- 129,134 ---- +*** misc/icu/source/config/mh-darwin Tue Jun 3 20:52:56 2003 +--- misc/build/icu/source/config/mh-darwin Sat Nov 20 23:55:37 2004 *************** *** 15,30 **** LD_FLAGS += -headerpad_max_install_names @@ -123,8 +107,23 @@ ! $(RM) $@ && ln -s $*.$(SO).$(SO_TARGET_VERSION) $@ ## End Darwin-specific setup -*** misc/icu/source/config/mh-linux Thu Jan 24 18:35:04 2002 ---- misc/build/icu/source/config/mh-linux Mon May 3 10:46:50 2004 +*** misc/icu/source/config/mh-irix Thu Jan 10 02:41:40 2002 +--- misc/build/icu/source/config/mh-irix Sat Nov 20 23:55:37 2004 +*************** +*** 10,15 **** +--- 10,19 ---- + SHAREDLIBCXXFLAGS = -shared + SHAREDLIBCPPFLAGS = + ++ ## Additional flags when building libraries and with threads ++ LIBCPPFLAGS = -D_REENTRANT ++ THREADSCPPFLAGS = -D_REENTRANT -D_PTHREADS ++ + ## Commands to generate dependency files + GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS) + GEN_DEPS.cc= $(CXX) -E -M $(DEFS) $(CPPFLAGS) +*** misc/icu/source/config/mh-linux Thu Jan 24 17:35:04 2002 +--- misc/build/icu/source/config/mh-linux Sat Nov 20 23:55:37 2004 *************** *** 10,15 **** --- 10,18 ---- @@ -138,25 +137,25 @@ SHAREDLIBCXXFLAGS = -fPIC SHAREDLIBCPPFLAGS = -DPIC *************** -*** 22,27 **** ---- 25,37 ---- +*** 21,26 **** +--- 24,36 ---- + ## Compiler switch to embed a runtime search path LD_RPATH= LD_RPATH_PRE = -Wl,-rpath, - ++ + ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH + ENABLE_RPATH=YES + RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN' + + #SH# ENABLE_RPATH=YES + #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'" -+ + ## Compiler switch to embed a library name LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) - -*** misc/icu/source/config/mh-solaris Tue Jul 30 04:46:10 2002 ---- misc/build/icu/source/config/mh-solaris Mon May 3 10:46:50 2004 +*** misc/icu/source/config/mh-solaris Tue Jul 30 02:46:10 2002 +--- misc/build/icu/source/config/mh-solaris Sat Nov 20 23:55:37 2004 *************** -*** 23,39 **** +*** 23,38 **** ## Commands to link ## For Sun Workshop, use CC to link to bring in C++ runtime @@ -173,8 +172,7 @@ ## Compiler switch to embed a library name LD_SONAME = -h $(MIDDLE_SO_TARGET) - ---- 23,47 ---- +--- 23,46 ---- ## Commands to link ## For Sun Workshop, use CC to link to bring in C++ runtime @@ -189,19 +187,18 @@ ## Compiler switch to embed a runtime search path LD_RPATH= -R LD_RPATH_PRE= - ++ + ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH + ENABLE_RPATH=YES + RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN' + + #SH# ENABLE_RPATH=YES + #SH# RPATHLDFLAGS="${LD_RPATH}'$$ORIGIN'" -+ + ## Compiler switch to embed a library name LD_SONAME = -h $(MIDDLE_SO_TARGET) - -*** misc/icu/source/data/makedata.mak Tue Jun 3 22:52:56 2003 ---- misc/build/icu/source/data/makedata.mak Tue May 4 15:08:23 2004 +*** misc/icu/source/data/makedata.mak Tue Jun 3 20:52:56 2003 +--- misc/build/icu/source/data/makedata.mak Sat Nov 20 23:55:37 2004 *************** *** 27,32 **** --- 27,33 ---- @@ -263,8 +260,8 @@ $(INDEX_RES_FILES): @echo Generating </source/data directory @@ -492,8 +489,8 @@ ! #ibm-5478_P100-1995.ucm\ ! #icu-internal-25546.ucm lmb-excp.ucm -*** misc/icu/source/extra/uconv/uconv.dsp Wed Jul 31 19:43:14 2002 ---- misc/build/icu/source/extra/uconv/uconv.dsp Tue May 4 13:47:27 2004 +*** misc/icu/source/extra/uconv/uconv.dsp Wed Jul 31 17:43:14 2002 +--- misc/build/icu/source/extra/uconv/uconv.dsp Sat Nov 20 23:55:42 2004 *************** *** 219,225 **** InputName=makedata @@ -528,8 +525,8 @@ # End Custom Build -*** misc/icu/source/i18n/tblcoll.cpp Fri Jun 6 07:05:22 2003 ---- misc/build/icu/source/i18n/tblcoll.cpp Mon May 3 10:46:50 2004 +*** misc/icu/source/i18n/tblcoll.cpp Fri Jun 6 05:05:22 2003 +--- misc/build/icu/source/i18n/tblcoll.cpp Sat Nov 20 23:55:43 2004 *************** *** 84,89 **** --- 84,101 ---- @@ -551,8 +548,8 @@ RuleBasedCollator::RuleBasedCollator(const UnicodeString& rules, UErrorCode& status) : dataIsOwned(FALSE) -*** misc/icu/source/i18n/ucol.cpp Wed Jun 11 01:05:58 2003 ---- misc/build/icu/source/i18n/ucol.cpp Mon May 3 10:46:50 2004 +*** misc/icu/source/i18n/ucol.cpp Tue Jun 10 23:05:58 2003 +--- misc/build/icu/source/i18n/ucol.cpp Sat Nov 20 23:55:43 2004 *************** *** 512,517 **** --- 512,570 ---- @@ -615,8 +612,8 @@ ucol_openRules( const UChar *rules, int32_t rulesLength, UColAttributeValue normalizationMode, -*** misc/icu/source/i18n/ucol_imp.h Wed Jun 11 23:50:54 2003 ---- misc/build/icu/source/i18n/ucol_imp.h Mon May 3 10:46:50 2004 +*** misc/icu/source/i18n/ucol_imp.h Wed Jun 11 21:50:54 2003 +--- misc/build/icu/source/i18n/ucol_imp.h Sat Nov 20 23:55:53 2004 *************** *** 457,462 **** --- 457,473 ---- @@ -637,8 +634,8 @@ * Used to set requested and valid locales on a collator returned by the collator * service. */ -*** misc/icu/source/i18n/unicode/tblcoll.h Mon Jun 9 08:13:14 2003 ---- misc/build/icu/source/i18n/unicode/tblcoll.h Mon May 3 10:46:50 2004 +*** misc/icu/source/i18n/unicode/tblcoll.h Mon Jun 9 06:13:14 2003 +--- misc/build/icu/source/i18n/unicode/tblcoll.h Sat Nov 20 23:55:53 2004 *************** *** 119,124 **** --- 119,126 ---- @@ -650,8 +647,24 @@ /** * RuleBasedCollator constructor. This takes the table rules and builds a * collation table out of them. Please see RuleBasedCollator class -*** misc/icu/source/layout/ArabicLayoutEngine.cpp Tue Jun 3 22:58:22 2003 ---- misc/build/icu/source/layout/ArabicLayoutEngine.cpp Mon May 3 10:46:50 2004 +*** misc/icu/source/icudefs.mk.in Tue Jun 3 06:44:40 2003 +--- misc/build/icu/source/icudefs.mk.in Sat Nov 20 23:55:53 2004 +*************** +*** 136,142 **** +--- 136,146 ---- + SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared + + # Environment variable to set a runtime search path ++ ifeq ($(OS), IRIX) ++ LDLIBRARYPATH_ENVVAR = LD_LIBRARYN32_PATH ++ else + LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH ++ endif + + # Versioned target for a shared library. + FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) +*** misc/icu/source/layout/ArabicLayoutEngine.cpp Tue Jun 3 20:58:22 2003 +--- misc/build/icu/source/layout/ArabicLayoutEngine.cpp Sat Nov 20 23:55:53 2004 *************** *** 3,8 **** --- 3,9 ---- @@ -701,21 +714,21 @@ LE_DELETE_ARRAY(tempChars); *************** -*** 267,272 **** ---- 287,297 ---- +*** 266,271 **** +--- 286,296 ---- + success = LE_ILLEGAL_ARGUMENT_ERROR; return; } - ++ + #if 1 // HDU: #105697# TODO: improve handling of deleted/mark glyphs + if( count != glyphCount ) + return; + #endif -+ + GDEFMarkFilter filter(fGDEFTable); - // FIXME: we could avoid the memory allocation and copying here by -*** misc/icu/source/layout/GXLayoutEngine.cpp Tue Jun 3 22:58:22 2003 ---- misc/build/icu/source/layout/GXLayoutEngine.cpp Mon May 3 10:46:50 2004 +*** misc/icu/source/layout/GXLayoutEngine.cpp Tue Jun 3 20:58:22 2003 +--- misc/build/icu/source/layout/GXLayoutEngine.cpp Sat Nov 20 23:55:53 2004 *************** *** 39,45 **** return 0; @@ -733,8 +746,8 @@ if (LE_FAILURE(success)) { return 0; -*** misc/icu/source/layout/LESwaps.h Tue Jun 3 22:58:22 2003 ---- misc/build/icu/source/layout/LESwaps.h Mon May 3 10:46:50 2004 +*** misc/icu/source/layout/LESwaps.h Tue Jun 3 20:58:22 2003 +--- misc/build/icu/source/layout/LESwaps.h Sat Nov 20 23:55:53 2004 *************** *** 3,8 **** --- 3,9 ---- @@ -746,7 +759,7 @@ */ *************** -*** 13,35 **** +*** 13,34 **** U_NAMESPACE_BEGIN @@ -757,7 +770,7 @@ ! * @draft ICU 2.2 ! */ ! #define SWAPW(value) (LESwaps::isBigEndian() ? (value) : LESwaps::swapWord(value)) - +! ! /** ! * A convenience macro which invokes the swapLong member function @@ -769,8 +782,7 @@ /** * This class is used to access data which stored in big endian order - * regardless of the conventions of the platform. It has been designed ---- 14,51 ---- +--- 14,50 ---- U_NAMESPACE_BEGIN @@ -780,37 +792,36 @@ ! // use of the SWAPx macros is intended for accessing a big endian ! // value e.g. for "Watanabe Gothic"'s "mort" table ! #define ALLOW_UNALIGNED_HACK - -+ #ifndef ALLOW_UNALIGNED_HACK -+ /** -+ * These are convenience macros which invoke the swap functions -+ * from a concise call. -+ */ -+ #define SWAPW(value) (LESwaps::isBigEndian() ? (value) : LESwaps::swapWord(value)) -+ #define SWAPL(value) (LESwaps::isBigEndian() ? (value) : LESwaps::swapLong(value)) -+ #else -+ #define SWAPW(rValue) loadBigEndianWord(reinterpret_cast(rValue)) -+ #define SWAPL(rValue) loadBigEndianLong(reinterpret_cast(rValue)) - +! +! #ifndef ALLOW_UNALIGNED_HACK +! /** +! * These are convenience macros which invoke the swap functions +! * from a concise call. +! */ +! #define SWAPW(value) (LESwaps::isBigEndian() ? (value) : LESwaps::swapWord(value)) +! #define SWAPL(value) (LESwaps::isBigEndian() ? (value) : LESwaps::swapLong(value)) +! #else +! #define SWAPW(rValue) loadBigEndianWord(reinterpret_cast(rValue)) +! #define SWAPL(rValue) loadBigEndianLong(reinterpret_cast(rValue)) +! ! inline le_uint16 loadBigEndianWord( const le_uint16& rValue ) ! { ! const le_uint8* p = reinterpret_cast(&rValue); ! return ((p[0] << 8) + p[1]); ! } +! +! inline le_uint32 loadBigEndianLong( const le_uint32& rValue ) +! { +! const le_uint8* p = reinterpret_cast(&rValue); +! return ((p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]); +! } + +! #endif -+ inline le_uint32 loadBigEndianLong( const le_uint32& rValue ) -+ { -+ const le_uint8* p = reinterpret_cast(&rValue); -+ return ((p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]); -+ } -+ -+ #endif -+ /** * This class is used to access data which stored in big endian order - * regardless of the conventions of the platform. It has been designed -*** misc/icu/source/layout/OpenTypeLayoutEngine.h Tue Jun 3 22:58:22 2003 ---- misc/build/icu/source/layout/OpenTypeLayoutEngine.h Mon May 3 10:46:50 2004 +*** misc/icu/source/layout/OpenTypeLayoutEngine.h Tue Jun 3 20:58:22 2003 +--- misc/build/icu/source/layout/OpenTypeLayoutEngine.h Sat Nov 20 23:55:54 2004 *************** *** 319,324 **** --- 319,337 ---- @@ -833,3 +844,224 @@ return tempGlyphCount; }; +*** misc/icu/source/test/ieeetest/ieeetest.cpp Wed Mar 21 19:46:50 2001 +--- misc/build/icu/source/test/ieeetest/ieeetest.cpp Sat Nov 20 23:57:11 2004 +*************** +*** 13,23 **** + ******************************************************************************* + */ + + #include + #include // DBL_MAX + + #include "ieeetest.h" +- #include "unicode/utypes.h" + #include "unicode/putil.h" + + //============================== +--- 13,23 ---- + ******************************************************************************* + */ + ++ #include "unicode/utypes.h" + #include + #include // DBL_MAX + + #include "ieeetest.h" + #include "unicode/putil.h" + + //============================== +*** misc/icu/source/test/intltest/loctest.cpp Wed Jun 4 23:56:50 2003 +--- misc/build/icu/source/test/intltest/loctest.cpp Sat Nov 20 23:55:54 2004 +*************** +*** 4,9 **** +--- 4,10 ---- + * others. All Rights Reserved. + ********************************************************************/ + ++ #include "unicode/utypes.h" + #include "loctest.h" + #include + #include +*** misc/icu/source/test/intltest/testidn.cpp Mon Jun 9 04:54:46 2003 +--- misc/build/icu/source/test/intltest/testidn.cpp Sat Nov 20 23:59:32 2004 +*************** +*** 19,27 **** + * in various IDNA conversion processes. + */ + + #include + #include +- #include "unicode/utypes.h" + + #if !UCONFIG_NO_IDNA && !UCONFIG_NO_TRANSLITERATION + +--- 19,27 ---- + * in various IDNA conversion processes. + */ + ++ #include "unicode/utypes.h" + #include + #include + + #if !UCONFIG_NO_IDNA && !UCONFIG_NO_TRANSLITERATION + +*** misc/icu/source/test/intltest/tsmutex.cpp Thu May 23 23:56:48 2002 +--- misc/build/icu/source/test/intltest/tsmutex.cpp Sat Nov 20 23:55:54 2004 +*************** +*** 4,9 **** +--- 4,10 ---- + * others. All Rights Reserved. + ********************************************************************/ + ++ #include "unicode/utypes.h" + #include "tsmutex.h" + #include + #include +*** misc/icu/source/test/intltest/tsputil.cpp Fri Oct 5 18:47:10 2001 +--- misc/build/icu/source/test/intltest/tsputil.cpp Sat Nov 20 23:55:54 2004 +*************** +*** 4,9 **** +--- 4,10 ---- + * others. All Rights Reserved. + ********************************************************************/ + ++ #include "unicode/utypes.h" + #include "tsputil.h" + + #include // DBL_MAX, DBL_MIN +*** misc/icu/source/test/intltest/uobjtest.cpp Tue Jun 3 20:56:50 2003 +--- misc/build/icu/source/test/intltest/uobjtest.cpp Sat Nov 20 23:55:55 2004 +*************** +*** 4,9 **** +--- 4,10 ---- + * others. All Rights Reserved. + ********************************************************************/ + ++ #include "unicode/utypes.h" + #include "uobjtest.h" + #include + +*** misc/icu/source/test/intltest/ustrtest.cpp Fri May 9 16:15:50 2003 +--- misc/build/icu/source/test/intltest/ustrtest.cpp Sat Nov 20 23:55:55 2004 +*************** +*** 4,9 **** +--- 4,10 ---- + * others. All Rights Reserved. + ********************************************************************/ + ++ #include "unicode/utypes.h" + #include "ustrtest.h" + #include "unicode/unistr.h" + #include "unicode/uchar.h" +*** misc/icu/source/tools/genbrk/genbrk.cpp Tue Jun 3 20:56:52 2003 +--- misc/build/icu/source/tools/genbrk/genbrk.cpp Sat Nov 20 23:55:55 2004 +*************** +*** 26,33 **** + // + //-------------------------------------------------------------------- + +- #include + #include "unicode/utypes.h" + #include "unicode/ucnv.h" + #include "unicode/unistr.h" + #include "unicode/rbbi.h" +--- 26,33 ---- + // + //-------------------------------------------------------------------- + + #include "unicode/utypes.h" ++ #include + #include "unicode/ucnv.h" + #include "unicode/unistr.h" + #include "unicode/rbbi.h" +*** misc/icu/source/tools/gennorm/gennorm.c Tue May 6 01:36:14 2003 +--- misc/build/icu/source/tools/gennorm/gennorm.c Sat Nov 20 23:55:55 2004 +*************** +*** 241,249 **** + return; + } + +! if(0==uprv_memcmp(s, "NO", 2)) { + qcFlags&=0xf; +! } else if(0==uprv_memcmp(s, "MAYBE", 5)) { + qcFlags&=0x30; + } else { + return; +--- 241,249 ---- + return; + } + +! if(0==uprv_strncmp(s, "NO", 2)) { + qcFlags&=0xf; +! } else if(0==uprv_strncmp(s, "MAYBE", 5)) { + qcFlags&=0x30; + } else { + return; +*** misc/icu/source/tools/genpname/genpname.cpp Tue Jun 3 22:23:50 2003 +--- misc/build/icu/source/tools/genpname/genpname.cpp Sat Nov 20 23:55:56 2004 +*************** +*** 8,16 **** + ********************************************************************** + */ + + #include + #include +- #include "unicode/utypes.h" + #include "unicode/putil.h" + #include "cmemory.h" + #include "cstring.h" +--- 8,16 ---- + ********************************************************************** + */ + ++ #include "unicode/utypes.h" + #include + #include + #include "unicode/putil.h" + #include "cmemory.h" + #include "cstring.h" +*** misc/icu/source/tools/gentz/gentz.cpp Tue Jun 3 20:56:54 2003 +--- misc/build/icu/source/tools/gentz/gentz.cpp Sat Nov 20 23:55:56 2004 +*************** +*** 25,33 **** + * See tz.pl for the file format that is READ by this program. + */ + + #include + #include +- #include "unicode/utypes.h" + #include "unicode/putil.h" + #include "cmemory.h" + #include "cstring.h" +--- 25,33 ---- + * See tz.pl for the file format that is READ by this program. + */ + ++ #include "unicode/utypes.h" + #include + #include + #include "unicode/putil.h" + #include "cmemory.h" + #include "cstring.h" +*** misc/icu/source/tools/genuca/genuca.cpp Tue Jun 3 20:56:54 2003 +--- misc/build/icu/source/tools/genuca/genuca.cpp Sat Nov 20 23:55:56 2004 +*************** +*** 23,30 **** + * 05/09/2001 weiv Case bits are now in the CEs, not in front + */ + +- #include + #include "unicode/utypes.h" + #include "unicode/udata.h" + #include "ucol_imp.h" + #include "genuca.h" +--- 23,30 ---- + * 05/09/2001 weiv Case bits are now in the CEs, not in front + */ + + #include "unicode/utypes.h" ++ #include + #include "unicode/udata.h" + #include "ucol_imp.h" + #include "genuca.h"