icu4c: headers diff between 4.1.3 and 4.2 versions

	LEGlyphStorage.h	LEGlyphStorage.h
	/*	/*
	**********************************************************************	**********************************************************************

	* Copyright (C) 1998-2008, International Business Machines	* Copyright (C) 1998-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	**********************************************************************	**********************************************************************
	*/	*/

	#ifndef __LEGLYPHSTORAGE_H	#ifndef __LEGLYPHSTORAGE_H
	#define __LEGLYPHSTORAGE_H	#define __LEGLYPHSTORAGE_H

	#include "LETypes.h"	#include "LETypes.h"
	#include "LEInsertionList.h"	#include "LEInsertionList.h"


	skipping to change at line 326	skipping to change at line 326
	* to do the insertion. It returns the address of storage where the new	* to do the insertion. It returns the address of storage where the new
	* glyph IDs can be stored. They will not actually be inserted into the	* glyph IDs can be stored. They will not actually be inserted into the
	* glyph array until <code>applyInsertions</code> is called.	* glyph array until <code>applyInsertions</code> is called.
	*	*
	* @param atIndex the index of the glyph to be replaced	* @param atIndex the index of the glyph to be replaced
	* @param insertCount the number of glyphs to replace it with	* @param insertCount the number of glyphs to replace it with
	* @param success set to an error code if the auxillary data cannot be retrieved.	* @param success set to an error code if the auxillary data cannot be retrieved.
	*	*
	* @return the address at which to store the replacement glyphs.	* @return the address at which to store the replacement glyphs.
	*	*

	* @see LEInsetionList.h	* @see LEInsertionList.h
	*	*

	* @stable ICU 3.0	* @draft ICU 4.2
	*/	*/
	LEGlyphID *insertGlyphs(le_int32 atIndex, le_int32 insertCount, LEError Code& success);	LEGlyphID *insertGlyphs(le_int32 atIndex, le_int32 insertCount, LEError Code& success);

	/**	/**

		* Call this method to replace a single glyph in the glyph array
		* with multiple glyphs. This method uses the <code>LEInsertionList</co
		de>
		* to do the insertion. It returns the address of storage where the new
		* glyph IDs can be stored. They will not actually be inserted into the
		* glyph array until <code>applyInsertions</code> is called.
		*
		* Note: Don't use this version, use the other version of this function
		which has an error code.
		*
		* @param atIndex the index of the glyph to be replaced
		* @param insertCount the number of glyphs to replace it with
		* @param success set to an error code if the auxillary data cannot be
		retrieved.
		*
		* @return the address at which to store the replacement glyphs.
		*
		* @see LEInsertionList.h
		*
		* @stable ICU 3.0
		*/
		LEGlyphID *insertGlyphs(le_int32 atIndex, le_int32 insertCount);

		/**
		* This method is used to reposition glyphs during Indic v2 processing.
		It moves
		* all of the relevant glyph information ( glyph, indices, positions, a
		nd auxData ),
		* from the source position to the target position, and also allows for
		a marker bit
		* to be set in the target glyph's auxData so that it won't be reproces
		sed later in the
		* cycle.
		*
		* @param fromPosition - position of the glyph to be moved
		* @param toPosition - target position of the glyph
		* @param marker marker bit
		*
		* @draft ICU 4.2
		*/
		void moveGlyph(le_int32 fromPosition, le_int32 toPosition, le_uint32 ma
		rker);

		/**
	* This method causes all of the glyph insertions recorded by	* This method causes all of the glyph insertions recorded by
	* <code>insertGlyphs</code> to be applied to the glyph array. The	* <code>insertGlyphs</code> to be applied to the glyph array. The
	* new slots in the char indices and the auxillary data arrays	* new slots in the char indices and the auxillary data arrays
	* will be filled in with the values for the glyph being replaced.	* will be filled in with the values for the glyph being replaced.
	*	*
	* @return the new size of the glyph array	* @return the new size of the glyph array
	*	*
	* @see LEInsertionList.h	* @see LEInsertionList.h
	*	*
	* @stable ICU 3.0	* @stable ICU 3.0

End of changes. 4 change blocks.
	3 lines changed or deleted	47 lines changed or added

	LELanguages.h	LELanguages.h
	/*	/*
	*	*

	* (C) Copyright IBM Corp. 1998-2008. All Rights Reserved.	* (C) Copyright IBM Corp. 1998-2009. All Rights Reserved.
	*	*
	* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS	* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
	* YOU REALLY KNOW WHAT YOU'RE DOING.	* YOU REALLY KNOW WHAT YOU'RE DOING.
	*	*
	* *************************************************************	* *************************************************************
	* Hand edited on 04/24/2008 to add correct @stable, @draft tags	* Hand edited on 04/24/2008 to add correct @stable, @draft tags
	* prior to updating the tool to track these.	* prior to updating the tool to track these.
	* *************************************************************	* *************************************************************
	*	*
	* Generated on: 04/24/2008 10:19:13 AM HST	* Generated on: 04/24/2008 10:19:13 AM HST

	skipping to change at line 68	skipping to change at line 68
	snhLanguageCode = 21,	snhLanguageCode = 21,
	syrLanguageCode = 22,	syrLanguageCode = 22,
	tamLanguageCode = 23,	tamLanguageCode = 23,
	telLanguageCode = 24,	telLanguageCode = 24,
	thaLanguageCode = 25,	thaLanguageCode = 25,
	urdLanguageCode = 26,	urdLanguageCode = 26,
	zhpLanguageCode = 27,	zhpLanguageCode = 27,
	zhsLanguageCode = 28,	zhsLanguageCode = 28,
	zhtLanguageCode = 29,	zhtLanguageCode = 29,


	/** New langauges codes added 03/13/2008 @draft ICU 4.0 */	/** New language codes added 03/13/2008 @stable ICU 4.0 */
	afkLanguageCode = 30,	afkLanguageCode = 30,
	belLanguageCode = 31,	belLanguageCode = 31,
	bgrLanguageCode = 32,	bgrLanguageCode = 32,
	catLanguageCode = 33,	catLanguageCode = 33,
	cheLanguageCode = 34,	cheLanguageCode = 34,
	copLanguageCode = 35,	copLanguageCode = 35,
	csyLanguageCode = 36,	csyLanguageCode = 36,
	danLanguageCode = 37,	danLanguageCode = 37,
	deuLanguageCode = 38,	deuLanguageCode = 38,
	dznLanguageCode = 39,	dznLanguageCode = 39,

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	LEScripts.h	LEScripts.h
	/*	/*
	*	*

	* (C) Copyright IBM Corp. 1998-2008. All Rights Reserved.	* (C) Copyright IBM Corp. 1998-2009, All Rights Reserved.
	*	*
	* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS	* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
	* YOU REALLY KNOW WHAT YOU'RE DOING.	* YOU REALLY KNOW WHAT YOU'RE DOING.
	*	*
	* *************************************************************	* *************************************************************
	* Hand edited on 04/24/2008 to add correct @stable, @draft tags	* Hand edited on 04/24/2008 to add correct @stable, @draft tags
	* prior to updating the tool to track these.	* prior to updating the tool to track these.
	* *************************************************************	* *************************************************************
	*	*
	* Generated on: 04/24/2008 10:19:12 AM HST	* Generated on: 04/24/2008 10:19:12 AM HST

	skipping to change at line 166	skipping to change at line 166
	lyciScriptCode = 107,	lyciScriptCode = 107,
	lydiScriptCode = 108,	lydiScriptCode = 108,
	olckScriptCode = 109,	olckScriptCode = 109,
	rjngScriptCode = 110,	rjngScriptCode = 110,
	saurScriptCode = 111,	saurScriptCode = 111,
	sgnwScriptCode = 112,	sgnwScriptCode = 112,
	sundScriptCode = 113,	sundScriptCode = 113,
	moonScriptCode = 114,	moonScriptCode = 114,
	mteiScriptCode = 115,	mteiScriptCode = 115,


	/** New script codes from ISO 15924 @draft ICU 4.0 */	/** New script codes from ISO 15924 @stable ICU 4.0 */
	armiScriptCode = 116,	armiScriptCode = 116,
	avstScriptCode = 117,	avstScriptCode = 117,
	cakmScriptCode = 118,	cakmScriptCode = 118,
	koreScriptCode = 119,	koreScriptCode = 119,
	kthiScriptCode = 120,	kthiScriptCode = 120,
	maniScriptCode = 121,	maniScriptCode = 121,
	phliScriptCode = 122,	phliScriptCode = 122,
	phlpScriptCode = 123,	phlpScriptCode = 123,
	phlvScriptCode = 124,	phlvScriptCode = 124,
	prtiScriptCode = 125,	prtiScriptCode = 125,

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	bmsearch.h	bmsearch.h

	skipping to change at line 203	skipping to change at line 203

	/**	/**
	* Return the <code>GoodSuffixTable</code> object computed for the patt ern string.	* Return the <code>GoodSuffixTable</code> object computed for the patt ern string.
	*	*
	* @return the <code>GoodSuffixTable</code> object computed for the pat tern string.	* @return the <code>GoodSuffixTable</code> object computed for the pat tern string.
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	GoodSuffixTable *getGoodSuffixTable();	GoodSuffixTable *getGoodSuffixTable();


	/*	/**
	* UObject glue...	* UObject glue...
	*/	*/
	virtual UClassID getDynamicClassID() const;	virtual UClassID getDynamicClassID() const;

		/**
		* UObject glue...
		*/
	static UClassID getStaticClassID();	static UClassID getStaticClassID();

	private:	private:
	CollData *data;	CollData *data;
	CEList *patCEs;	CEList *patCEs;
	BadCharacterTable *badCharacterTable;	BadCharacterTable *badCharacterTable;
	GoodSuffixTable *goodSuffixTable;	GoodSuffixTable *goodSuffixTable;
	UnicodeString pattern;	UnicodeString pattern;
	Target *target;	Target *target;
	};	};

End of changes. 2 change blocks.
	1 lines changed or deleted	4 lines changed or added

	coll.h	coll.h

	skipping to change at line 62	skipping to change at line 62
	#include "unicode/utypes.h"	#include "unicode/utypes.h"

	#if !UCONFIG_NO_COLLATION	#if !UCONFIG_NO_COLLATION

	#include "unicode/uobject.h"	#include "unicode/uobject.h"
	#include "unicode/ucol.h"	#include "unicode/ucol.h"
	#include "unicode/normlzr.h"	#include "unicode/normlzr.h"
	#include "unicode/locid.h"	#include "unicode/locid.h"
	#include "unicode/uniset.h"	#include "unicode/uniset.h"
	#include "unicode/umisc.h"	#include "unicode/umisc.h"

		#include "unicode/uiter.h"
		#include "unicode/stringpiece.h"

	U_NAMESPACE_BEGIN	U_NAMESPACE_BEGIN

	class StringEnumeration;	class StringEnumeration;

	#if !UCONFIG_NO_SERVICE	#if !UCONFIG_NO_SERVICE
	/**	/**
	* @stable ICU 2.6	* @stable ICU 2.6
	*/	*/
	class CollatorFactory;	class CollatorFactory;

	skipping to change at line 441	skipping to change at line 443
	* @return Returns an enum value. UCOL_GREATER if source is greater	* @return Returns an enum value. UCOL_GREATER if source is greater
	* than target; UCOL_EQUAL if source is equal to target; UCOL_LESS if s ource is less	* than target; UCOL_EQUAL if source is equal to target; UCOL_LESS if s ource is less
	* than target	* than target
	* @stable ICU 2.6	* @stable ICU 2.6
	*/	*/
	virtual UCollationResult compare(const UChar* source, int32_t sourceLen gth,	virtual UCollationResult compare(const UChar* source, int32_t sourceLen gth,
	const UChar* target, int32_t targetLe ngth,	const UChar* target, int32_t targetLe ngth,
	UErrorCode &status) const = 0;	UErrorCode &status) const = 0;

	/**	/**

		* Compares two strings using the Collator.
		* Returns whether the first one compares less than/equal to/greater th
		an
		* the second one.
		* This version takes UCharIterator input.
		* @param sIter the first ("source") string iterator
		* @param tIter the second ("target") string iterator
		* @param status ICU status
		* @return UCOL_LESS, UCOL_EQUAL or UCOL_GREATER
		* @draft ICU 4.2
		*/
		virtual UCollationResult compare(UCharIterator &sIter,
		UCharIterator &tIter,
		UErrorCode &status) const;

		/**
		* Compares two UTF-8 strings using the Collator.
		* Returns whether the first one compares less than/equal to/greater th
		an
		* the second one.
		* This version takes UTF-8 input.
		* Note that a StringPiece can be implicitly constructed
		* from a std::string or a NUL-terminated const char * string.
		* @param source the first UTF-8 string
		* @param target the second UTF-8 string
		* @param status ICU status
		* @return UCOL_LESS, UCOL_EQUAL or UCOL_GREATER
		* @draft ICU 4.2
		*/
		virtual UCollationResult compareUTF8(const StringPiece &source,
		const StringPiece &target,
		UErrorCode &status) const;

		/**
	* Transforms the string into a series of characters that can be compar ed	* Transforms the string into a series of characters that can be compar ed
	* with CollationKey::compareTo. It is not possible to restore the orig inal	* with CollationKey::compareTo. It is not possible to restore the orig inal
	* string from the chars in the sort key. The generated sort key handl es	* string from the chars in the sort key. The generated sort key handl es
	* only a limited number of ignorable characters.	* only a limited number of ignorable characters.
	* <p>Use CollationKey::equals or CollationKey::compare to compare the	* <p>Use CollationKey::equals or CollationKey::compare to compare the
	* generated sort keys.	* generated sort keys.
	* If the source string is null, a null collation key will be returned.	* If the source string is null, a null collation key will be returned.
	* @param source the source string to be transformed into a sort key.	* @param source the source string to be transformed into a sort key.
	* @param key the collation key to be filled in	* @param key the collation key to be filled in
	* @param status the error code status.	* @param status the error code status.

	skipping to change at line 643	skipping to change at line 677
	* @stable ICU 3.0	* @stable ICU 3.0
	*/	*/
	static StringEnumeration* U_EXPORT2 getKeywordValues(const char *keywor d, UErrorCode& status);	static StringEnumeration* U_EXPORT2 getKeywordValues(const char *keywor d, UErrorCode& status);

	/**	/**
	* Given a key and a locale, returns an array of string values in a pre ferred	* Given a key and a locale, returns an array of string values in a pre ferred
	* order that would make a difference. These are all and only those val ues where	* order that would make a difference. These are all and only those val ues where
	* the open (creation) of the service with the locale formed from the i nput locale	* the open (creation) of the service with the locale formed from the i nput locale
	* plus input keyword and that value has different behavior than creati on with the	* plus input keyword and that value has different behavior than creati on with the
	* input locale alone.	* input locale alone.

	* @param key one of the keys supported by this service. For now, only	* @param keyword one of the keys supported by this service. Fo r now, only
	* "collation" is supported.	* "collation" is supported.
	* @param locale the locale	* @param locale the locale
	* @param commonlyUsed if set to true it will return only commonly use d values	* @param commonlyUsed if set to true it will return only commonly use d values
	* with the given locale in preferred order. Othe rwise,	* with the given locale in preferred order. Othe rwise,
	* it will return all the available values for the locale.	* it will return all the available values for the locale.

		* @param status ICU status
	* @return a string enumeration over keyword values for the given key a nd the locale.	* @return a string enumeration over keyword values for the given key a nd the locale.
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	static StringEnumeration* U_EXPORT2 getKeywordValuesForLocale(const cha r* keyword, const Locale& locale,	static StringEnumeration* U_EXPORT2 getKeywordValuesForLocale(const cha r* keyword, const Locale& locale,
	UBool c ommonlyUsed, UErrorCode& status);	UBool c ommonlyUsed, UErrorCode& status);

	/**	/**
	* Return the functionally equivalent locale for the given	* Return the functionally equivalent locale for the given
	* requested locale, with respect to given keyword, for the	* requested locale, with respect to given keyword, for the
	* collation service. If two locales return the same result, then	* collation service. If two locales return the same result, then

End of changes. 4 change blocks.
	1 lines changed or deleted	38 lines changed or added

	colldata.h	colldata.h

	skipping to change at line 26	skipping to change at line 26

	#include "unicode/utypes.h"	#include "unicode/utypes.h"

	#if !UCONFIG_NO_COLLATION	#if !UCONFIG_NO_COLLATION

	#include "unicode/uobject.h"	#include "unicode/uobject.h"
	#include "unicode/ucol.h"	#include "unicode/ucol.h"

	U_NAMESPACE_BEGIN	U_NAMESPACE_BEGIN


	/*	/**
	* The size of the internal buffer for the Collator's short description str ing.	* The size of the internal buffer for the Collator's short description str ing.
	*/	*/
	#define KEY_BUFFER_SIZE 64	#define KEY_BUFFER_SIZE 64


	/*	/**
	* The size of the internal CE buffer in a <code>CEList</code> object	* The size of the internal CE buffer in a <code>CEList</code> object
	*/	*/
	#define CELIST_BUFFER_SIZE 4	#define CELIST_BUFFER_SIZE 4


	/*	/**
	* Define this to enable the <code>CEList</code> objects to collect	* Define this to enable the <code>CEList</code> objects to collect
	* statistics.	* statistics.
	*/	*/
	//#define INSTRUMENT_CELIST	//#define INSTRUMENT_CELIST


	/*	/**
	* The size of the initial list in a <code>StringList</code> object.	* The size of the initial list in a <code>StringList</code> object.
	*/	*/
	#define STRING_LIST_BUFFER_SIZE 16	#define STRING_LIST_BUFFER_SIZE 16


	/*	/**
	* Define this to enable the <code>StringList</code> objects to	* Define this to enable the <code>StringList</code> objects to
	* collect statistics.	* collect statistics.
	*/	*/
	//#define INSTRUMENT_STRING_LIST	//#define INSTRUMENT_STRING_LIST

	/**	/**

	* CEList
	*
	* This object holds a list of CEs generated from a particular	* This object holds a list of CEs generated from a particular
	* <code>UnicodeString</code>	* <code>UnicodeString</code>
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	class U_I18N_API CEList : public UObject	class U_I18N_API CEList : public UObject
	{	{
	public:	public:
	/**	/**
	* Construct a <code>CEList</code> object.	* Construct a <code>CEList</code> object.

	skipping to change at line 108	skipping to change at line 106
	* @return the CE, or <code>0</code> if <code>index</code> is out of ra nge	* @return the CE, or <code>0</code> if <code>index</code> is out of ra nge
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	uint32_t get(int32_t index) const;	uint32_t get(int32_t index) const;

	/**	/**
	* Check if the CEs in another <code>CEList</code> match the	* Check if the CEs in another <code>CEList</code> match the
	* suffix of this list starting at a give offset.	* suffix of this list starting at a give offset.
	*	*

	* @param offsset - the offset of the suffix	* @param offset - the offset of the suffix
	* @param other - the other <code>CEList</code>	* @param other - the other <code>CEList</code>
	*	*
	* @return <code>TRUE</code> if the CEs match, <code>FALSE</code> other wise.	* @return <code>TRUE</code> if the CEs match, <code>FALSE</code> other wise.
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	UBool matchesAt(int32_t offset, const CEList *other) const;	UBool matchesAt(int32_t offset, const CEList *other) const;

	/**	/**
	* The index operator.	* The index operator.
	*	*
	* @param index - the index	* @param index - the index
	*	*
	* @return a reference to the given CE in the list	* @return a reference to the given CE in the list
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	uint32_t &operator[](int32_t index) const;	uint32_t &operator[](int32_t index) const;


	/*	/**
	* UObject glue...	* UObject glue...
	*/	*/
	virtual UClassID getDynamicClassID() const;	virtual UClassID getDynamicClassID() const;

		/**
		* UObject glue...
		*/
	static UClassID getStaticClassID();	static UClassID getStaticClassID();

	private:	private:
	void add(uint32_t ce, UErrorCode &status);	void add(uint32_t ce, UErrorCode &status);

	uint32_t ceBuffer[CELIST_BUFFER_SIZE];	uint32_t ceBuffer[CELIST_BUFFER_SIZE];
	uint32_t *ces;	uint32_t *ces;
	int32_t listMax;	int32_t listMax;
	int32_t listSize;	int32_t listSize;


	skipping to change at line 220	skipping to change at line 221

	/**	/**
	* Get the number of stings in the list.	* Get the number of stings in the list.
	*	*
	* @return the number of strings in the list.	* @return the number of strings in the list.
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	int32_t size() const;	int32_t size() const;


	/*	/**
	* the UObject glue...	* the UObject glue...
	*/	*/
	virtual UClassID getDynamicClassID() const;	virtual UClassID getDynamicClassID() const;

		/**
		* the UObject glue...
		*/
	static UClassID getStaticClassID();	static UClassID getStaticClassID();

	private:	private:
	UnicodeString *strings;	UnicodeString *strings;
	int32_t listMax;	int32_t listMax;
	int32_t listSize;	int32_t listSize;

	#ifdef INSTRUMENT_STRING_LIST	#ifdef INSTRUMENT_STRING_LIST
	static int32_t _lists;	static int32_t _lists;
	static int32_t _strings;	static int32_t _strings;

	skipping to change at line 329	skipping to change at line 333
	* must call <code>freeCEList</code> when you are finished	* must call <code>freeCEList</code> when you are finished
	* using the <code>CEList</code>/	* using the <code>CEList</code>/
	*	*
	* @internal ICU 4.0.1 technology preview.	* @internal ICU 4.0.1 technology preview.
	*/	*/
	const CEList getCEList(const UnicodeString string) const;	const CEList getCEList(const UnicodeString string) const;

	/**	/**
	* Release a <code>CEList</code> returned by <code>getCEList</code>.	* Release a <code>CEList</code> returned by <code>getCEList</code>.
	*	*

	* @param list - the <CEList> to free.	* @param list - the <code>CEList</code> to free.
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	void freeCEList(const CEList *list);	void freeCEList(const CEList *list);

	/**	/**
	* Return the length of the shortest string that will generate	* Return the length of the shortest string that will generate
	* the given list of CEs.	* the given list of CEs.
	*	*
	* @param ces - the CEs	* @param ces - the CEs

	skipping to change at line 360	skipping to change at line 364
	* the given list of CEs.	* the given list of CEs.
	*	*
	* Note: the algorithm used to do this computation is recursive. To	* Note: the algorithm used to do this computation is recursive. To
	* limit the amount of recursion, a "history" list is used to record	* limit the amount of recursion, a "history" list is used to record
	* the best answer starting at a particular offset in the list of CEs.	* the best answer starting at a particular offset in the list of CEs.
	* If the same offset is visited again during the recursion, the answer	* If the same offset is visited again during the recursion, the answer
	* in the history list is used.	* in the history list is used.
	*	*
	* @param ces - the CEs	* @param ces - the CEs
	* @param offset - the offset of the first CE in the list to use.	* @param offset - the offset of the first CE in the list to use.

	* param history - the history list. Must be at least as long as	* @param history - the history list. Must be at least as long as
	* the number of cEs in the <code>CEList</code>	* the number of cEs in the <code>CEList</code>
	*	*
	* @return the length of the shortest string.	* @return the length of the shortest string.
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	int32_t minLengthInChars(const CEList ces, int32_t offset, int32_t his tory) const;	int32_t minLengthInChars(const CEList ces, int32_t offset, int32_t his tory) const;


	/*	/**
	* UObject glue...	* UObject glue...
	*/	*/
	virtual UClassID getDynamicClassID() const;	virtual UClassID getDynamicClassID() const;

		/**
		* UObject glue...
		*/
	static UClassID getStaticClassID();	static UClassID getStaticClassID();

	/**	/**
	* <code>CollData</code> objects are expensive to compute, and so	* <code>CollData</code> objects are expensive to compute, and so
	* may be cached. This routine will free the cached objects and delete	* may be cached. This routine will free the cached objects and delete
	* the cache.	* the cache.
	*	*
	* WARNING: Don't call this until you are have called <code>close</code >	* WARNING: Don't call this until you are have called <code>close</code >
	* for each <code>CollData</code> object that you have used. also,	* for each <code>CollData</code> object that you have used. also,
	* DO NOT call this if another thread may be calling <code>flushCollDat aCache</code>	* DO NOT call this if another thread may be calling <code>flushCollDat aCache</code>

End of changes. 15 change blocks.
	13 lines changed or deleted	20 lines changed or added

	currpinf.h	currpinf.h

	skipping to change at line 25	skipping to change at line 25
	*/	*/

	#if !UCONFIG_NO_FORMATTING	#if !UCONFIG_NO_FORMATTING

	#include "unicode/unistr.h"	#include "unicode/unistr.h"

	union UHashTok;	union UHashTok;

	U_NAMESPACE_BEGIN	U_NAMESPACE_BEGIN


	U_CDECL_BEGIN

	/**
	* @internal ICU 4.2
	*/
	static UBool U_CALLCONV ValueComparator(UHashTok val1, UHashTok val2) ;

	U_CDECL_END

	class Locale;	class Locale;
	class PluralRules;	class PluralRules;
	class Hashtable;	class Hashtable;

	/**	/**
	* This class represents the information needed by	* This class represents the information needed by
	* DecimalFormat to format currency plural,	* DecimalFormat to format currency plural,
	* such as "3.00 US dollars" or "1.00 US dollar".	* such as "3.00 US dollars" or "1.00 US dollar".
	* DecimalFormat creates for itself an instance of	* DecimalFormat creates for itself an instance of
	* CurrencyPluralInfo from its locale data.	* CurrencyPluralInfo from its locale data.

	skipping to change at line 186	skipping to change at line 177
	*	*
	* @param loc the new locale to set	* @param loc the new locale to set
	* @param status output param set to success/failure code on exit	* @param status output param set to success/failure code on exit
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	void setLocale(const Locale& loc, UErrorCode& status);	void setLocale(const Locale& loc, UErrorCode& status);

	/**	/**
	* ICU "poor man's RTTI", returns a UClassID for the actual class.	* ICU "poor man's RTTI", returns a UClassID for the actual class.
	*	*

	* @stable ICU 2.2	* @draft ICU 4.2
	*/	*/
	virtual UClassID getDynamicClassID() const;	virtual UClassID getDynamicClassID() const;

	/**	/**
	* ICU "poor man's RTTI", returns a UClassID for this class.	* ICU "poor man's RTTI", returns a UClassID for this class.
	*	*

	* @stable ICU 2.2	* @draft ICU 4.2
	*/	*/
	static UClassID U_EXPORT2 getStaticClassID();	static UClassID U_EXPORT2 getStaticClassID();

	private:	private:
	friend class DecimalFormat;	friend class DecimalFormat;

	void initialize(const Locale& loc, UErrorCode& status);	void initialize(const Locale& loc, UErrorCode& status);

	void setupCurrencyPluralPattern(const Locale& loc, UErrorCode& status);	void setupCurrencyPluralPattern(const Locale& loc, UErrorCode& status);


End of changes. 3 change blocks.
	11 lines changed or deleted	2 lines changed or added

	datefmt.h	datefmt.h

	skipping to change at line 144	skipping to change at line 144
	* <p><em>User subclasses are not supported.</em> While clients may write	* <p><em>User subclasses are not supported.</em> While clients may write
	* subclasses, such code will not necessarily work and will not be	* subclasses, such code will not necessarily work and will not be
	* guaranteed to work stably from release to release.	* guaranteed to work stably from release to release.
	*/	*/
	class U_I18N_API DateFormat : public Format {	class U_I18N_API DateFormat : public Format {
	public:	public:

	/**	/**
	* Constants for various style patterns. These reflect the order of ite ms in	* Constants for various style patterns. These reflect the order of ite ms in
	* the DateTimePatterns resource. There are 4 time patterns, 4 date pat terns,	* the DateTimePatterns resource. There are 4 time patterns, 4 date pat terns,

	* and then the date-time pattern. Each block of 4 values in the resour	* the default date-time pattern, and 4 date-time patterns. Each block
	ce occurs	of 4 values
	* in the order full, long, medium, short.	* in the resource occurs in the order full, long, medium, short.
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	enum EStyle	enum EStyle
	{	{
	kNone = -1,	kNone = -1,

	kFull = 0,	kFull = 0,
	kLong = 1,	kLong = 1,
	kMedium = 2,	kMedium = 2,
	kShort = 3,	kShort = 3,

	kDateOffset = kShort + 1,	kDateOffset = kShort + 1,
	// kFull + kDateOffset = 4	// kFull + kDateOffset = 4
	// kLong + kDateOffset = 5	// kLong + kDateOffset = 5
	// kMedium + kDateOffset = 6	// kMedium + kDateOffset = 6
	// kShort + kDateOffset = 7	// kShort + kDateOffset = 7

	kDateTime = 8,	kDateTime = 8,

		// Default DateTime

		kDateTimeOffset = kDateTime + 1,
		// kFull + kDateTimeOffset = 9
		// kLong + kDateTimeOffset = 10
		// kMedium + kDateTimeOffset = 11
		// kShort + kDateTimeOffset = 12

	// relative dates	// relative dates
	kRelative = (1 << 7),	kRelative = (1 << 7),

	kFullRelative = (kFull \| kRelative),	kFullRelative = (kFull \| kRelative),

	kLongRelative = kLong \| kRelative,	kLongRelative = kLong \| kRelative,

	kMediumRelative = kMedium \| kRelative,	kMediumRelative = kMedium \| kRelative,


End of changes. 2 change blocks.
	3 lines changed or deleted	10 lines changed or added

	dcfmtsym.h	dcfmtsym.h
	/*	/*
	************************************************************************* ***	************************************************************************* ***

	* Copyright (C) 1997-2007, International Business Machines	* Copyright (C) 1997-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	************************************************************************* ***	************************************************************************* ***
	*	*
	* File DCFMTSYM.H	* File DCFMTSYM.H
	*	*
	* Modification History:	* Modification History:
	*	*
	* Date Name Description	* Date Name Description
	* 02/19/97 aliu Converted from java.	* 02/19/97 aliu Converted from java.
	* 03/18/97 clhuang Updated per C++ implementation.	* 03/18/97 clhuang Updated per C++ implementation.

	skipping to change at line 132	skipping to change at line 132
	kSignificantDigitSymbol,	kSignificantDigitSymbol,
	/** The monetary grouping separator	/** The monetary grouping separator
	* @stable ICU 3.6	* @stable ICU 3.6
	*/	*/
	kMonetaryGroupingSeparatorSymbol,	kMonetaryGroupingSeparatorSymbol,
	/** count symbol constants */	/** count symbol constants */
	kFormatSymbolCount	kFormatSymbolCount
	};	};

	/**	/**

		* Constants for specifying currency spacing
		* @draft ICU 4.2
		*/
		enum ECurrencySpacing {
		kCurrencyMatch,
		kSurroundingMatch,
		kInsert,
		kCurrencySpacingCount
		};

		/**
	* Create a DecimalFormatSymbols object for the given locale.	* Create a DecimalFormatSymbols object for the given locale.
	*	*
	* @param locale The locale to get symbols for.	* @param locale The locale to get symbols for.
	* @param status Input/output parameter, set to success or	* @param status Input/output parameter, set to success or
	* failure code upon return.	* failure code upon return.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	DecimalFormatSymbols(const Locale& locale, UErrorCode& status);	DecimalFormatSymbols(const Locale& locale, UErrorCode& status);

	/**	/**

	skipping to change at line 225	skipping to change at line 236
	inline Locale getLocale() const;	inline Locale getLocale() const;

	/**	/**
	* Returns the locale for this object. Two flavors are available:	* Returns the locale for this object. Two flavors are available:
	* valid and actual locale.	* valid and actual locale.
	* @stable ICU 2.8	* @stable ICU 2.8
	*/	*/
	Locale getLocale(ULocDataLocaleType type, UErrorCode& status) const;	Locale getLocale(ULocDataLocaleType type, UErrorCode& status) const;

	/**	/**

		* Get pattern string for 'CurrencySpacing' that can be applied to
		* currency format.
		* This API gets the CurrencySpacing data from ResourceBundle. The pat
		tern can
		* be empty if there is no data from current locale and its parent loc
		ales.
		*
		* @param type : kCurrencyMatch, kSurroundingMatch or kInsert.
		* @param beforeCurrency : true if the pattern is for before currency
		symbol.
		* false if the pattern is for after currency
		symbol.
		* @param status: Input/output parameter, set to success or
		* failure code upon return.
		* @return pattern string for currencyMatch, surroundingMatch or space
		Insert.
		* Return empty string if there is no data for this locale and its
		parent
		* locales.
		* @draft ICU 4.2
		*/
		const UnicodeString& getPatternForCurrencySpacing(ECurrencySpacing typ
		e,
		UBool beforeCurrency,
		UErrorCode& status) const;
		/**
		* Set pattern string for 'CurrencySpacing' that can be applied to
		* currency format.
		*
		* @param type : kCurrencyMatch, kSurroundingMatch or kInsert.
		* @param beforeCurrency : true if the pattern is for before currency
		symbol.
		* false if the pattern is for after currency
		symbol.
		* @param pattern : pattern string to override current setting.
		* @draft ICU 4.2
		*/
		void setPatternForCurrencySpacing(ECurrencySpacing type,
		UBool beforeCurrency,
		const UnicodeString& pattern);

		/**
	* ICU "poor man's RTTI", returns a UClassID for the actual class.	* ICU "poor man's RTTI", returns a UClassID for the actual class.
	*	*
	* @stable ICU 2.2	* @stable ICU 2.2
	*/	*/
	virtual UClassID getDynamicClassID() const;	virtual UClassID getDynamicClassID() const;

	/**	/**
	* ICU "poor man's RTTI", returns a UClassID for this class.	* ICU "poor man's RTTI", returns a UClassID for this class.
	*	*
	* @stable ICU 2.2	* @stable ICU 2.2

	skipping to change at line 318	skipping to change at line 362
	* Non-symbol variable for getConstSymbol(). Always empty.	* Non-symbol variable for getConstSymbol(). Always empty.
	* @internal	* @internal
	*/	*/
	UnicodeString fNoSymbol;	UnicodeString fNoSymbol;

	Locale locale;	Locale locale;

	char actualLocale[ULOC_FULLNAME_CAPACITY];	char actualLocale[ULOC_FULLNAME_CAPACITY];
	char validLocale[ULOC_FULLNAME_CAPACITY];	char validLocale[ULOC_FULLNAME_CAPACITY];
	const UChar* currPattern;	const UChar* currPattern;


		UnicodeString currencySpcBeforeSym[kCurrencySpacingCount];
		UnicodeString currencySpcAfterSym[kCurrencySpacingCount];
	};	};

	// -------------------------------------	// -------------------------------------

	inline UnicodeString	inline UnicodeString
	DecimalFormatSymbols::getSymbol(ENumberFormatSymbol symbol) const {	DecimalFormatSymbols::getSymbol(ENumberFormatSymbol symbol) const {
	const UnicodeString *strPtr;	const UnicodeString *strPtr;
	if(symbol < kFormatSymbolCount) {	if(symbol < kFormatSymbolCount) {
	strPtr = &fSymbols[symbol];	strPtr = &fSymbols[symbol];
	} else {	} else {

End of changes. 4 change blocks.
	1 lines changed or deleted	57 lines changed or added

	decimfmt.h	decimfmt.h

	skipping to change at line 48	skipping to change at line 48

	union UHashTok;	union UHashTok;

	U_NAMESPACE_BEGIN	U_NAMESPACE_BEGIN

	U_CDECL_BEGIN	U_CDECL_BEGIN

	/**	/**
	* @internal ICU 4.2	* @internal ICU 4.2
	*/	*/

	static UBool U_CALLCONV AffixValueComparator(UHashTok val1, UHashTok val2) ;	UBool U_CALLCONV decimfmtAffixValueComparator(UHashTok val1, UHashTok val2) ;

	/**	/**
	* @internal ICU 4.2	* @internal ICU 4.2
	*/	*/

	static UBool U_CALLCONV AffixPatternValueComparator(UHashTok val1, UHashTok val2) ;	UBool U_CALLCONV decimfmtAffixPatternValueComparator(UHashTok val1, UHashTo k val2) ;

	U_CDECL_END	U_CDECL_END

	class DigitList;	class DigitList;
	class ChoiceFormat;	class ChoiceFormat;
	class CurrencyPluralInfo;	class CurrencyPluralInfo;
	class Hashtable;	class Hashtable;

	/**	/**
	* DecimalFormat is a concrete subclass of NumberFormat that formats decima l	* DecimalFormat is a concrete subclass of NumberFormat that formats decima l

	skipping to change at line 735	skipping to change at line 735
	* @param symbolsToAdopt the set of symbols to be used. The caller should not	* @param symbolsToAdopt the set of symbols to be used. The caller should not
	* delete this object after making this call.	* delete this object after making this call.
	* @param status Output param set to success/failure code. I f the	* @param status Output param set to success/failure code. I f the
	* pattern is invalid this will be set to a fa ilure code.	* pattern is invalid this will be set to a fa ilure code.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	DecimalFormat( const UnicodeString& pattern,	DecimalFormat( const UnicodeString& pattern,
	DecimalFormatSymbols* symbolsToAdopt,	DecimalFormatSymbols* symbolsToAdopt,
	UErrorCode& status);	UErrorCode& status);


	/*	/**
	* This API is for ICU use only.	* This API is for ICU use only.
	* Create a DecimalFormat from the given pattern, symbols, and style.	* Create a DecimalFormat from the given pattern, symbols, and style.
	*	*
	* @param pattern a non-localized pattern string	* @param pattern a non-localized pattern string
	* @param symbolsToAdopt the set of symbols to be used. The caller should not	* @param symbolsToAdopt the set of symbols to be used. The caller should not
	* delete this object after making this call.	* delete this object after making this call.
	* @param style style of decimal format, kNumberStyle etc.	* @param style style of decimal format, kNumberStyle etc.
	* @param status Output param set to success/failure code. I f the	* @param status Output param set to success/failure code. I f the
	* pattern is invalid this will be set to a fa ilure code.	* pattern is invalid this will be set to a fa ilure code.
	* @internal ICU 4.2	* @internal ICU 4.2

	skipping to change at line 1734	skipping to change at line 1734
	* clone() methods call this method.	* clone() methods call this method.
	*	*
	* @return The class ID for this object. All objects of a	* @return The class ID for this object. All objects of a
	* given class have the same class ID. Objects of	* given class have the same class ID. Objects of
	* other classes have different class IDs.	* other classes have different class IDs.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	virtual UClassID getDynamicClassID(void) const;	virtual UClassID getDynamicClassID(void) const;

	private:	private:

	friend UBool U_CALLCONV AffixValueComparator(UHashTok val1, UHashTok va	friend UBool U_CALLCONV decimfmtAffixValueComparator(UHashTok val1, UHa
	l2);	shTok val2);
	friend UBool U_CALLCONV AffixPatternValueComparator(UHashTok val1, UHas	friend UBool U_CALLCONV decimfmtAffixPatternValueComparator(UHashTok va
	hTok val2);	l1, UHashTok val2);

	DecimalFormat(); // default constructor not implemented	DecimalFormat(); // default constructor not implemented

	int32_t precision(UBool isIntegral) const;	int32_t precision(UBool isIntegral) const;

	/**	/**
	* Do real work of constructing a new DecimalFormat.	* Do real work of constructing a new DecimalFormat.
	*/	*/
	void construct(UErrorCode& status,	void construct(UErrorCode& status,
	UParseError& parseErr,	UParseError& parseErr,

	skipping to change at line 1829	skipping to change at line 1829
	fgStatusInfinite,	fgStatusInfinite,
	fgStatusLength // Leave last in list.	fgStatusLength // Leave last in list.
	} StatusFlags;	} StatusFlags;

	UBool subparse(const UnicodeString& text,	UBool subparse(const UnicodeString& text,
	const UnicodeString* negPrefix,	const UnicodeString* negPrefix,
	const UnicodeString* negSuffix,	const UnicodeString* negSuffix,
	const UnicodeString* posPrefix,	const UnicodeString* posPrefix,
	const UnicodeString* posSuffix,	const UnicodeString* posSuffix,
	UBool currencyParsing,	UBool currencyParsing,

		int8_t type,
	ParsePosition& parsePosition,	ParsePosition& parsePosition,
	DigitList& digits, UBool* status,	DigitList& digits, UBool* status,
	UChar* currency) const;	UChar* currency) const;

	// Mixed style parsing for currency.	// Mixed style parsing for currency.
	// It parses against the current currency pattern	// It parses against the current currency pattern
	// using complex affix comparison	// using complex affix comparison
	// parses against the currency plural patterns using complex affix comp arison,	// parses against the currency plural patterns using complex affix comp arison,
	// and parses against the current pattern using simple affix comparison .	// and parses against the current pattern using simple affix comparison .
	UBool parseForCurrency(const UnicodeString& text,	UBool parseForCurrency(const UnicodeString& text,

	skipping to change at line 1852	skipping to change at line 1853
	UChar* currency) const;	UChar* currency) const;

	int32_t skipPadding(const UnicodeString& text, int32_t position) const;	int32_t skipPadding(const UnicodeString& text, int32_t position) const;

	int32_t compareAffix(const UnicodeString& input,	int32_t compareAffix(const UnicodeString& input,
	int32_t pos,	int32_t pos,
	UBool isNegative,	UBool isNegative,
	UBool isPrefix,	UBool isPrefix,
	const UnicodeString* affixPat,	const UnicodeString* affixPat,
	UBool currencyParsing,	UBool currencyParsing,

		int8_t type,
	UChar* currency) const;	UChar* currency) const;

	static int32_t compareSimpleAffix(const UnicodeString& affix,	static int32_t compareSimpleAffix(const UnicodeString& affix,
	const UnicodeString& input,	const UnicodeString& input,
	int32_t pos);	int32_t pos);

	static int32_t skipRuleWhiteSpace(const UnicodeString& text, int32_t po s);	static int32_t skipRuleWhiteSpace(const UnicodeString& text, int32_t po s);

	static int32_t skipUWhiteSpace(const UnicodeString& text, int32_t pos);	static int32_t skipUWhiteSpace(const UnicodeString& text, int32_t pos);

	int32_t compareComplexAffix(const UnicodeString& affixPat,	int32_t compareComplexAffix(const UnicodeString& affixPat,
	const UnicodeString& input,	const UnicodeString& input,
	int32_t pos,	int32_t pos,

		int8_t type,
	UChar* currency) const;	UChar* currency) const;

	static int32_t match(const UnicodeString& text, int32_t pos, UChar32 ch );	static int32_t match(const UnicodeString& text, int32_t pos, UChar32 ch );

	static int32_t match(const UnicodeString& text, int32_t pos, const Unic odeString& str);	static int32_t match(const UnicodeString& text, int32_t pos, const Unic odeString& str);

	/**	/**
	* Get a decimal format symbol.	* Get a decimal format symbol.
	* Returns a const reference to the symbol string.	* Returns a const reference to the symbol string.
	* @internal	* @internal

	skipping to change at line 2037	skipping to change at line 2040
	// TODO: innerclass?	// TODO: innerclass?
	struct AffixPatternsForCurrency : public UMemory {	struct AffixPatternsForCurrency : public UMemory {
	// negative prefix pattern	// negative prefix pattern
	UnicodeString negPrefixPatternForCurrency;	UnicodeString negPrefixPatternForCurrency;
	// negative suffix pattern	// negative suffix pattern
	UnicodeString negSuffixPatternForCurrency;	UnicodeString negSuffixPatternForCurrency;
	// positive prefix pattern	// positive prefix pattern
	UnicodeString posPrefixPatternForCurrency;	UnicodeString posPrefixPatternForCurrency;
	// positive suffix pattern	// positive suffix pattern
	UnicodeString posSuffixPatternForCurrency;	UnicodeString posSuffixPatternForCurrency;

		int8_t patternType;

	AffixPatternsForCurrency(const UnicodeString& negPrefix,	AffixPatternsForCurrency(const UnicodeString& negPrefix,
	const UnicodeString& negSuffix,	const UnicodeString& negSuffix,
	const UnicodeString& posPrefix,	const UnicodeString& posPrefix,

	const UnicodeString& posSuffix) {	const UnicodeString& posSuffix,
		int8_t type) {
	negPrefixPatternForCurrency = negPrefix;	negPrefixPatternForCurrency = negPrefix;
	negSuffixPatternForCurrency = negSuffix;	negSuffixPatternForCurrency = negSuffix;
	posPrefixPatternForCurrency = posPrefix;	posPrefixPatternForCurrency = posPrefix;
	posSuffixPatternForCurrency = posSuffix;	posSuffixPatternForCurrency = posSuffix;

		patternType = type;
	}	}
	};	};

	/* affix for currency formatting when the currency sign in the pattern	/* affix for currency formatting when the currency sign in the pattern
	* equals to 3, such as the pattern contains 3 currency sign or	* equals to 3, such as the pattern contains 3 currency sign or
	* the formatter style is currency plural format style.	* the formatter style is currency plural format style.
	*/	*/
	struct AffixesForCurrency : public UMemory {	struct AffixesForCurrency : public UMemory {
	// negative prefix	// negative prefix
	UnicodeString negPrefixForCurrency;	UnicodeString negPrefixForCurrency;

End of changes. 10 change blocks.
	8 lines changed or deleted	14 lines changed or added

	docmain.h	docmain.h
	/********************************************************************	/********************************************************************
	* COPYRIGHT:	* COPYRIGHT:

	* Copyright (c) 1997-2008, International Business Machines Corporation and	* Copyright (c) 1997-2009, International Business Machines Corporation and
	* others. All Rights Reserved.	* others. All Rights Reserved.
	*	*
	* FILE NAME: DOCMAIN.h	* FILE NAME: DOCMAIN.h
	*	*
	* Date Name Description	* Date Name Description
	* 12/11/2000 Ram Creation.	* 12/11/2000 Ram Creation.
	*/	*/

	/* This file contains documentation for Doxygen and doesnot have	/* This file contains documentation for Doxygen and doesnot have
	* any significance with respect to C or C++ API	* any significance with respect to C or C++ API

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	dtintrv.h	dtintrv.h
	/*	/*
	************************************************************************* **	************************************************************************* **

	* Copyright (C) 2008, International Business Machines Corporation and	* Copyright (C) 2008-2009, International Business Machines Corporation and
	* others. All Rights Reserved.	* others. All Rights Reserved.
	************************************************************************* **	************************************************************************* **
	*	*
	* File DTINTRV.H	* File DTINTRV.H
	*	*
	************************************************************************* **	************************************************************************* **
	*/	*/

	#ifndef __DTINTRV_H__	#ifndef __DTINTRV_H__
	#define __DTINTRV_H__	#define __DTINTRV_H__

	skipping to change at line 28	skipping to change at line 28
	/**	/**
	* \file	* \file
	* \brief C++ API: Date Interval data type	* \brief C++ API: Date Interval data type
	*/	*/

	U_NAMESPACE_BEGIN	U_NAMESPACE_BEGIN

	/**	/**
	* This class represents a date interval.	* This class represents a date interval.
	* It is a pair of UDate representing from UDate 1 to UDate 2.	* It is a pair of UDate representing from UDate 1 to UDate 2.

	* @draft ICU 4.0	* @stable ICU 4.0
	**/	**/
	class U_COMMON_API DateInterval : public UObject {	class U_COMMON_API DateInterval : public UObject {
	public:	public:

	/**	/**
	* Construct a DateInterval given a from date and a to date.	* Construct a DateInterval given a from date and a to date.
	* @param fromDate The from date in date interval.	* @param fromDate The from date in date interval.
	* @param toDate The to date in date interval.	* @param toDate The to date in date interval.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	DateInterval(UDate fromDate, UDate toDate);	DateInterval(UDate fromDate, UDate toDate);

	/**	/**
	* destructor	* destructor

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	virtual ~DateInterval();	virtual ~DateInterval();

	/**	/**
	* Get the from date.	* Get the from date.
	* @return the from date in dateInterval.	* @return the from date in dateInterval.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	UDate getFromDate() const;	UDate getFromDate() const;

	/**	/**
	* Get the to date.	* Get the to date.
	* @return the to date in dateInterval.	* @return the to date in dateInterval.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	UDate getToDate() const;	UDate getToDate() const;

	/**	/**
	* Return the class ID for this class. This is useful only for comparin g to	* Return the class ID for this class. This is useful only for comparin g to
	* a return value from getDynamicClassID(). For example:	* a return value from getDynamicClassID(). For example:
	* <pre>	* <pre>
	* . Base* polymorphic_pointer = createPolymorphicObject();	* . Base* polymorphic_pointer = createPolymorphicObject();
	* . if (polymorphic_pointer->getDynamicClassID() ==	* . if (polymorphic_pointer->getDynamicClassID() ==
	* . erived::getStaticClassID()) ...	* . erived::getStaticClassID()) ...
	* </pre>	* </pre>
	* @return The class ID for all objects of this class.	* @return The class ID for all objects of this class.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	static UClassID U_EXPORT2 getStaticClassID(void);	static UClassID U_EXPORT2 getStaticClassID(void);

	/**	/**
	* Returns a unique class ID POLYMORPHICALLY. Pure virtual override. Th is	* Returns a unique class ID POLYMORPHICALLY. Pure virtual override. Th is
	* method is to implement a simple version of RTTI, since not all C++	* method is to implement a simple version of RTTI, since not all C++
	* compilers support genuine RTTI. Polymorphic operator==() and clone()	* compilers support genuine RTTI. Polymorphic operator==() and clone()
	* methods call this method.	* methods call this method.
	*	*
	* @return The class ID for this object. All objects of a	* @return The class ID for this object. All objects of a
	* given class have the same class ID. Objects of	* given class have the same class ID. Objects of
	* other classes have different class IDs.	* other classes have different class IDs.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	virtual UClassID getDynamicClassID(void) const;	virtual UClassID getDynamicClassID(void) const;

	/**	/**
	* Copy constructor.	* Copy constructor.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	DateInterval(const DateInterval& other);	DateInterval(const DateInterval& other);

	/**	/**
	* Default assignment operator	* Default assignment operator

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	DateInterval& operator=(const DateInterval&);	DateInterval& operator=(const DateInterval&);

	/**	/**
	* Equality operator.	* Equality operator.
	* @return TRUE if the two DateIntervals are the same	* @return TRUE if the two DateIntervals are the same

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	virtual UBool operator==(const DateInterval& other) const;	virtual UBool operator==(const DateInterval& other) const;

	/**	/**
	* Non-equality operator	* Non-equality operator
	* @return TRUE if the two DateIntervals are not the same	* @return TRUE if the two DateIntervals are not the same

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	UBool operator!=(const DateInterval& other) const;	UBool operator!=(const DateInterval& other) const;

	/**	/**
	* clone this object.	* clone this object.
	* The caller owns the result and should delete it when done.	* The caller owns the result and should delete it when done.
	* @return a cloned DateInterval	* @return a cloned DateInterval

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	virtual DateInterval* clone() const;	virtual DateInterval* clone() const;

	private:	private:
	/**	/**
	* Default constructor, not implemented.	* Default constructor, not implemented.

	* @draft ICU 4.0
	*/	*/
	DateInterval();	DateInterval();

	UDate fromDate;	UDate fromDate;
	UDate toDate;	UDate toDate;

	} ;// end class DateInterval	} ;// end class DateInterval

	inline UDate	inline UDate
	DateInterval::getFromDate() const {	DateInterval::getFromDate() const {

End of changes. 14 change blocks.
	14 lines changed or deleted	13 lines changed or added

	dtptngen.h	dtptngen.h
	/*	/*
	************************************************************************* **	************************************************************************* **

	* Copyright (C) 2007-2008, International Business Machines Corporation and	* Copyright (C) 2007-2009, International Business Machines Corporation and
	* others. All Rights Reserved.	* others. All Rights Reserved.
	************************************************************************* **	************************************************************************* **
	*	*
	* File DTPTNGEN.H	* File DTPTNGEN.H
	*	*
	************************************************************************* **	************************************************************************* **
	*/	*/

	#ifndef __DTPTNGEN_H__	#ifndef __DTPTNGEN_H__
	#define __DTPTNGEN_H__	#define __DTPTNGEN_H__

	skipping to change at line 394	skipping to change at line 394
	DistanceInfo *distanceInfo;	DistanceInfo *distanceInfo;
	PatternMap *patternMap;	PatternMap *patternMap;
	UnicodeString appendItemFormats[UDATPG_FIELD_COUNT];	UnicodeString appendItemFormats[UDATPG_FIELD_COUNT];
	UnicodeString appendItemNames[UDATPG_FIELD_COUNT];	UnicodeString appendItemNames[UDATPG_FIELD_COUNT];
	UnicodeString dateTimeFormat;	UnicodeString dateTimeFormat;
	UnicodeString decimal;	UnicodeString decimal;
	DateTimeMatcher *skipMatcher;	DateTimeMatcher *skipMatcher;
	Hashtable *fAvailableFormatKeyHash;	Hashtable *fAvailableFormatKeyHash;
	UnicodeString hackPattern;	UnicodeString hackPattern;
	UnicodeString emptyString;	UnicodeString emptyString;

		UChar fDefaultHourFormatChar;

	void initData(const Locale &locale, UErrorCode &status);	void initData(const Locale &locale, UErrorCode &status);
	void addCanonicalItems();	void addCanonicalItems();
	void addICUPatterns(const Locale& locale, UErrorCode& status);	void addICUPatterns(const Locale& locale, UErrorCode& status);
	void hackTimes(const UnicodeString& hackPattern, UErrorCode& status);	void hackTimes(const UnicodeString& hackPattern, UErrorCode& status);
	void addCLDRData(const Locale& locale);	void addCLDRData(const Locale& locale);
	UDateTimePatternConflict addPatternWithSkeleton(const UnicodeString& pa ttern, const UnicodeString * skeletonToUse, UBool override, UnicodeString& conflictingPattern, UErrorCode& status);	UDateTimePatternConflict addPatternWithSkeleton(const UnicodeString& pa ttern, const UnicodeString * skeletonToUse, UBool override, UnicodeString& conflictingPattern, UErrorCode& status);
	void initHashtable(UErrorCode& status);	void initHashtable(UErrorCode& status);
	void setDateTimeFromCalendar(const Locale& locale, UErrorCode& status);	void setDateTimeFromCalendar(const Locale& locale, UErrorCode& status);
	void setDecimalSymbols(const Locale& locale, UErrorCode& status);	void setDecimalSymbols(const Locale& locale, UErrorCode& status);

End of changes. 2 change blocks.
	1 lines changed or deleted	2 lines changed or added

	gregocal.h	gregocal.h
	/*	/*

	* Copyright (C) 1997-2006, International Business Machines Corporation and others.	* Copyright (C) 1997-2009, International Business Machines Corporation and others.
	* All Rights Reserved.	* All Rights Reserved.
	************************************************************************* ***	************************************************************************* ***
	*	*
	* File GREGOCAL.H	* File GREGOCAL.H
	*	*
	* Modification History:	* Modification History:
	*	*
	* Date Name Description	* Date Name Description
	* 04/22/97 aliu Overhauled header.	* 04/22/97 aliu Overhauled header.
	* 07/28/98 stephen Sync with JDK 1.2	* 07/28/98 stephen Sync with JDK 1.2

	skipping to change at line 90	skipping to change at line 90
	* return;	* return;
	* }	* }
	*	*
	* // begin output	* // begin output
	* cout << "Current Time" << endl;	* cout << "Current Time" << endl;
	*	*
	* // create a Pacific Standard Time time zone	* // create a Pacific Standard Time time zone
	* SimpleTimeZone* pdt = new SimpleTimeZone(-8 * 60 * 60 * 1000, ids->u next(NULL, success)));	* SimpleTimeZone* pdt = new SimpleTimeZone(-8 * 60 * 60 * 1000, ids->u next(NULL, success)));
	*	*
	* // set up rules for daylight savings time	* // set up rules for daylight savings time

	* pdt->setStartRule(Calendar::APRIL, 1, Calendar::SUNDAY, 2 * 60 * 60	* pdt->setStartRule(UCAL_MARCH, 1, UCAL_SUNDAY, 2 * 60 * 60 * 1000);
	* 1000);	* pdt->setEndRule(UCAL_NOVEMBER, 2, UCAL_SUNDAY, 2 * 60 * 60 * 1000);
	* pdt->setEndRule(Calendar::OCTOBER, -1, Calendar::SUNDAY, 2 * 60 * 60
	* 1000);
	*	*
	* // create a GregorianCalendar with the Pacific Daylight time zone	* // create a GregorianCalendar with the Pacific Daylight time zone
	* // and the current date and time	* // and the current date and time
	* Calendar* calendar = new GregorianCalendar( pdt, success );	* Calendar* calendar = new GregorianCalendar( pdt, success );
	*	*
	* // print out a bunch of interesting things	* // print out a bunch of interesting things

	* cout << "ERA: " << calendar->get( Calendar::ERA, success ) << endl;	* cout << "ERA: " << calendar->get( UCAL_ERA, success ) << endl;
	* cout << "YEAR: " << calendar->get( Calendar::YEAR, success ) << endl	* cout << "YEAR: " << calendar->get( UCAL_YEAR, success ) << endl;
	;	* cout << "MONTH: " << calendar->get( UCAL_MONTH, success ) << endl;
	* cout << "MONTH: " << calendar->get( Calendar::MONTH, success ) << en	* cout << "WEEK_OF_YEAR: " << calendar->get( UCAL_WEEK_OF_YEAR, succes
	dl;	s ) << endl;
	* cout << "WEEK_OF_YEAR: " << calendar->get( Calendar::WEEK_OF_YEAR, s	* cout << "WEEK_OF_MONTH: " << calendar->get( UCAL_WEEK_OF_MONTH, succ
	uccess ) << endl;	ess ) << endl;
	* cout << "WEEK_OF_MONTH: " << calendar->get( Calendar::WEEK_OF_MONTH,	* cout << "DATE: " << calendar->get( UCAL_DATE, success ) << endl;
	success ) << endl;	* cout << "DAY_OF_MONTH: " << calendar->get( UCAL_DAY_OF_MONTH, succes
	* cout << "DATE: " << calendar->get( Calendar::DATE, success ) << endl	s ) << endl;
	;	* cout << "DAY_OF_YEAR: " << calendar->get( UCAL_DAY_OF_YEAR, success
	* cout << "DAY_OF_MONTH: " << calendar->get( Calendar::DAY_OF_MONTH, s	) << endl;
	uccess ) << endl;	* cout << "DAY_OF_WEEK: " << calendar->get( UCAL_DAY_OF_WEEK, success
	* cout << "DAY_OF_YEAR: " << calendar->get( Calendar::DAY_OF_YEAR, suc	) << endl;
	cess ) << endl;	* cout << "DAY_OF_WEEK_IN_MONTH: " << calendar->get( UCAL_DAY_OF_WEEK_
	* cout << "DAY_OF_WEEK: " << calendar->get( Calendar::DAY_OF_WEEK, suc	IN_MONTH, success ) << endl;
	cess ) << endl;	* cout << "AM_PM: " << calendar->get( UCAL_AM_PM, success ) << endl;
	* cout << "DAY_OF_WEEK_IN_MONTH: " << calendar->get( Calendar::DAY_OF_	* cout << "HOUR: " << calendar->get( UCAL_HOUR, success ) << endl;
	WEEK_IN_MONTH, success ) << endl;	* cout << "HOUR_OF_DAY: " << calendar->get( UCAL_HOUR_OF_DAY, success
	* cout << "AM_PM: " << calendar->get( Calendar::AM_PM, success ) << en	) << endl;
	dl;	* cout << "MINUTE: " << calendar->get( UCAL_MINUTE, success ) << endl;
	* cout << "HOUR: " << calendar->get( Calendar::HOUR, success ) << endl	* cout << "SECOND: " << calendar->get( UCAL_SECOND, success ) << endl;
	;	* cout << "MILLISECOND: " << calendar->get( UCAL_MILLISECOND, success
	* cout << "HOUR_OF_DAY: " << calendar->get( Calendar::HOUR_OF_DAY, suc	) << endl;
	cess ) << endl;	* cout << "ZONE_OFFSET: " << (calendar->get( UCAL_ZONE_OFFSET, success
	* cout << "MINUTE: " << calendar->get( Calendar::MINUTE, success ) <<	)/(60601000)) << endl;
	endl;	* cout << "DST_OFFSET: " << (calendar->get( UCAL_DST_OFFSET, success )
	* cout << "SECOND: " << calendar->get( Calendar::SECOND, success ) <<	/(60601000)) << endl;
	endl;
	* cout << "MILLISECOND: " << calendar->get( Calendar::MILLISECOND, suc
	cess ) << endl;
	* cout << "ZONE_OFFSET: " << (calendar->get( Calendar::ZONE_OFFSET, su
	ccess )/(60601000)) << endl;
	* cout << "DST_OFFSET: " << (calendar->get( Calendar::DST_OFFSET, succ
	ess )/(60601000)) << endl;
	*	*
	* cout << "Current Time, with hour reset to 3" << endl;	* cout << "Current Time, with hour reset to 3" << endl;

	* calendar->clear(Calendar::HOUR_OF_DAY); // so doesn't override	* calendar->clear(UCAL_HOUR_OF_DAY); // so doesn't override
	* calendar->set(Calendar::HOUR, 3);	* calendar->set(UCAL_HOUR, 3);
	* cout << "ERA: " << calendar->get( Calendar::ERA, success ) << endl;	* cout << "ERA: " << calendar->get( UCAL_ERA, success ) << endl;
	* cout << "YEAR: " << calendar->get( Calendar::YEAR, success ) << endl	* cout << "YEAR: " << calendar->get( UCAL_YEAR, success ) << endl;
	;	* cout << "MONTH: " << calendar->get( UCAL_MONTH, success ) << endl;
	* cout << "MONTH: " << calendar->get( Calendar::MONTH, success ) << en	* cout << "WEEK_OF_YEAR: " << calendar->get( UCAL_WEEK_OF_YEAR, succes
	dl;	s ) << endl;
	* cout << "WEEK_OF_YEAR: " << calendar->get( Calendar::WEEK_OF_YEAR, s	* cout << "WEEK_OF_MONTH: " << calendar->get( UCAL_WEEK_OF_MONTH, succ
	uccess ) << endl;	ess ) << endl;
	* cout << "WEEK_OF_MONTH: " << calendar->get( Calendar::WEEK_OF_MONTH,	* cout << "DATE: " << calendar->get( UCAL_DATE, success ) << endl;
	success ) << endl;	* cout << "DAY_OF_MONTH: " << calendar->get( UCAL_DAY_OF_MONTH, succes
	* cout << "DATE: " << calendar->get( Calendar::DATE, success ) << endl	s ) << endl;
	;	* cout << "DAY_OF_YEAR: " << calendar->get( UCAL_DAY_OF_YEAR, success
	* cout << "DAY_OF_MONTH: " << calendar->get( Calendar::DAY_OF_MONTH, s	) << endl;
	uccess ) << endl;	* cout << "DAY_OF_WEEK: " << calendar->get( UCAL_DAY_OF_WEEK, success
	* cout << "DAY_OF_YEAR: " << calendar->get( Calendar::DAY_OF_YEAR, suc	) << endl;
	cess ) << endl;	* cout << "DAY_OF_WEEK_IN_MONTH: " << calendar->get( UCAL_DAY_OF_WEEK_
	* cout << "DAY_OF_WEEK: " << calendar->get( Calendar::DAY_OF_WEEK, suc	IN_MONTH, success ) << endl;
	cess ) << endl;	* cout << "AM_PM: " << calendar->get( UCAL_AM_PM, success ) << endl;
	* cout << "DAY_OF_WEEK_IN_MONTH: " << calendar->get( Calendar::DAY_OF_	* cout << "HOUR: " << calendar->get( UCAL_HOUR, success ) << endl;
	WEEK_IN_MONTH, success ) << endl;	* cout << "HOUR_OF_DAY: " << calendar->get( UCAL_HOUR_OF_DAY, success
	* cout << "AM_PM: " << calendar->get( Calendar::AM_PM, success ) << en	) << endl;
	dl;	* cout << "MINUTE: " << calendar->get( UCAL_MINUTE, success ) << endl;
	* cout << "HOUR: " << calendar->get( Calendar::HOUR, success ) << endl	* cout << "SECOND: " << calendar->get( UCAL_SECOND, success ) << endl;
	;	* cout << "MILLISECOND: " << calendar->get( UCAL_MILLISECOND, success
	* cout << "HOUR_OF_DAY: " << calendar->get( Calendar::HOUR_OF_DAY, suc	) << endl;
	cess ) << endl;	* cout << "ZONE_OFFSET: " << (calendar->get( UCAL_ZONE_OFFSET, success
	* cout << "MINUTE: " << calendar->get( Calendar::MINUTE, success ) <<	)/(60601000)) << endl; // in hours
	endl;	* cout << "DST_OFFSET: " << (calendar->get( UCAL_DST_OFFSET, success )
	* cout << "SECOND: " << calendar->get( Calendar::SECOND, success ) <<	/(60601000)) << endl; // in hours
	endl;
	* cout << "MILLISECOND: " << calendar->get( Calendar::MILLISECOND, suc
	cess ) << endl;
	* cout << "ZONE_OFFSET: " << (calendar->get( Calendar::ZONE_OFFSET, su
	ccess )/(60601000)) << endl; // in hours
	* cout << "DST_OFFSET: " << (calendar->get( Calendar::DST_OFFSET, succ
	ess )/(60601000)) << endl; // in hours
	*	*
	* if (U_FAILURE(success)) {	* if (U_FAILURE(success)) {
	* cout << "An error occured. success=" << u_errorName(success) << endl;	* cout << "An error occured. success=" << u_errorName(success) << endl;
	* }	* }
	*	*
	* delete ids;	* delete ids;
	* delete calendar; // also deletes pdt	* delete calendar; // also deletes pdt
	* \endcode	* \endcode
	* </pre>	* </pre>
	* @stable ICU 2.0	* @stable ICU 2.0

End of changes. 4 change blocks.
	77 lines changed or deleted	61 lines changed or added

	numsys.h	numsys.h

	skipping to change at line 23	skipping to change at line 23
	************************************************************************* ***	************************************************************************* ***
	*/	*/

	#ifndef NUMSYS	#ifndef NUMSYS
	#define NUMSYS	#define NUMSYS

	#include "unicode/utypes.h"	#include "unicode/utypes.h"

	/**	/**
	* \file	* \file

	* \brief C++ API: NumberingSystems object	* \brief C++ API: NumberingSystem object
	*/	*/

	#if !UCONFIG_NO_FORMATTING	#if !UCONFIG_NO_FORMATTING

	#include "unicode/format.h"	#include "unicode/format.h"
	#include "unicode/uobject.h"	#include "unicode/uobject.h"

	U_NAMESPACE_BEGIN	U_NAMESPACE_BEGIN

	/**	/**

	* Defines numbering systems. Put more description here.	* Defines numbering systems. A numbering system describes the scheme by wh
		ich
		* numbers are to be presented to the end user. In its simplest form, a nu
		mbering
		* system describes the set of digit characters that are to be used to disp
		lay
		* numbers, such as Western digits, Thai digits, Arabic-Indic digits, etc.
		* More complicated numbering systems are algorithmic in nature, and requir
		e use
		* of an RBNF formatter ( rule based number formatter ), in order to calcul
		ate
		* the characters to be displayed for a given number. Examples of algorith
		mic
		* numbering systems include Roman numerals, Chinese numerals, and Hebrew n
		umerals.
		* Formatting rules for many commonly used numbering systems are included i
		n
		* the ICU package, based on the numbering system rules defined in CLDR.
		* Alternate numbering systems can be specified to a locale by using the
		* numbers locale keyword.
	*/	*/

	class U_I18N_API NumberingSystem : public UObject {	class U_I18N_API NumberingSystem : public UObject {
	public:	public:

	/**	/**
	* Default Constructor.	* Default Constructor.
	*	*
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/

	skipping to change at line 62	skipping to change at line 73

	/**	/**
	* Destructor.	* Destructor.
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	virtual ~NumberingSystem();	virtual ~NumberingSystem();

	/**	/**
	* Create the default numbering system associated with the specified lo cale.	* Create the default numbering system associated with the specified lo cale.
	* @param inLocale The given locale.	* @param inLocale The given locale.

		* @param status ICU status
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	static NumberingSystem* U_EXPORT2 createInstance(const Locale & inLocal e, UErrorCode& status);	static NumberingSystem* U_EXPORT2 createInstance(const Locale & inLocal e, UErrorCode& status);

	/**	/**
	* Create the default numbering system associated with the default loca le.	* Create the default numbering system associated with the default loca le.
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	static NumberingSystem* U_EXPORT2 createInstance(UErrorCode& status);	static NumberingSystem* U_EXPORT2 createInstance(UErrorCode& status);

	/**	/**
	* Create a numbering system using the specified radix, type, and descr iption.	* Create a numbering system using the specified radix, type, and descr iption.
	* @param radix The radix (base) for this numbering system.	* @param radix The radix (base) for this numbering system.
	* @param isAlgorithmic TRUE if the numbering system is algorithmic rat her than numeric.	* @param isAlgorithmic TRUE if the numbering system is algorithmic rat her than numeric.
	* @param description The string representing the set of digits used in a numeric system, or the name of the RBNF	* @param description The string representing the set of digits used in a numeric system, or the name of the RBNF
	* ruleset to be used in an algorithmic system.	* ruleset to be used in an algorithmic system.

		* @param status ICU status
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	static NumberingSystem* U_EXPORT2 createInstance(int32_t radix, UBool i sAlgorithmic, const UnicodeString& description, UErrorCode& status );	static NumberingSystem* U_EXPORT2 createInstance(int32_t radix, UBool i sAlgorithmic, const UnicodeString& description, UErrorCode& status );

	/**	/**
	* Return a StringEnumeration over all the names of numbering systems k nown to ICU.	* Return a StringEnumeration over all the names of numbering systems k nown to ICU.
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/

	static StringEnumeration * U_EXPORT2 getAvailableNames(UErrorCode& sta tus);	static StringEnumeration * U_EXPORT2 getAvailableNames(UErrorCode& sta tus);

	/**	/**
	* Create a numbering system from one of the predefined numbering syste ms known to ICU.	* Create a numbering system from one of the predefined numbering syste ms known to ICU.
	* @param name The name of the numbering system.	* @param name The name of the numbering system.

		* @param status ICU status
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	static NumberingSystem* U_EXPORT2 createInstanceByName(const char* name , UErrorCode& status);	static NumberingSystem* U_EXPORT2 createInstanceByName(const char* name , UErrorCode& status);

	/**	/**
	* Returns the radix of this numbering system.	* Returns the radix of this numbering system.
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	int32_t getRadix();	int32_t getRadix();


	skipping to change at line 122	skipping to change at line 136
	*	*
	* @return TRUE if the numbering system is algorithmic.	* @return TRUE if the numbering system is algorithmic.
	* Otherwise, return FALSE.	* Otherwise, return FALSE.
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	UBool isAlgorithmic() const;	UBool isAlgorithmic() const;

	/**	/**
	* ICU "poor man's RTTI", returns a UClassID for this class.	* ICU "poor man's RTTI", returns a UClassID for this class.
	*	*

	* @draft ICU 4.0	* @draft ICU 4.2
	*	*
	*/	*/
	static UClassID U_EXPORT2 getStaticClassID(void);	static UClassID U_EXPORT2 getStaticClassID(void);

	/**	/**
	* ICU "poor man's RTTI", returns a UClassID for the actual class.	* ICU "poor man's RTTI", returns a UClassID for the actual class.
	*	*

	* @draft ICU 4.0	* @draft ICU 4.2
	*/	*/
	virtual UClassID getDynamicClassID() const;	virtual UClassID getDynamicClassID() const;

	private:	private:
	UnicodeString desc;	UnicodeString desc;
	int32_t radix;	int32_t radix;
	UBool algorithmic;	UBool algorithmic;

	void setRadix(int32_t radix);	void setRadix(int32_t radix);


End of changes. 7 change blocks.
	4 lines changed or deleted	26 lines changed or added

	platform.h	platform.h
	/*	/*
	************************************************************************* *	************************************************************************* *
	*	*

	* Copyright (C) 1997-2008, International Business Machines	* Copyright (C) 1997-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	*	*
	************************************************************************* *	************************************************************************* *
	*	*
	* FILE NAME : platform.h	* FILE NAME : platform.h
	*	*
	* Date Name Description	* Date Name Description
	* 05/13/98 nos Creation (content moved here from ptypes.h).	* 05/13/98 nos Creation (content moved here from ptypes.h).
	* 03/02/99 stephen Added AS400 support.	* 03/02/99 stephen Added AS400 support.
	* 03/30/99 stephen Added Linux support.	* 03/30/99 stephen Added Linux support.

	skipping to change at line 62	skipping to change at line 62
	* "An Extensible I/O Facility for C++" at the summer USENIX conference).	* "An Extensible I/O Facility for C++" at the summer USENIX conference).
	* If U_IOSTREAM_SOURCE is 0, then C++ streams are not available and	* If U_IOSTREAM_SOURCE is 0, then C++ streams are not available and
	* support for them will be silently suppressed in ICU.	* support for them will be silently suppressed in ICU.
	*	*
	*/	*/

	#ifndef U_IOSTREAM_SOURCE	#ifndef U_IOSTREAM_SOURCE
	#define U_IOSTREAM_SOURCE 199711	#define U_IOSTREAM_SOURCE 199711
	#endif	#endif


		/**
		* \def U_HAVE_STD_STRING
		* Define whether the standard C++ (STL) <string> header is available.
		* For platforms that do not use platform.h and do not define this constant
		* in their platform-specific headers, std_string.h defaults
		* U_HAVE_STD_STRING to 1.
		* @draft ICU 4.2
		*/
		#ifndef U_HAVE_STD_STRING
		#define U_HAVE_STD_STRING 1
		#endif

	/** @{ Determines whether specific types are available */	/** @{ Determines whether specific types are available */
	#ifndef U_HAVE_INT8_T	#ifndef U_HAVE_INT8_T
	#define U_HAVE_INT8_T 1	#define U_HAVE_INT8_T 1
	#endif	#endif

	#ifndef U_HAVE_UINT8_T	#ifndef U_HAVE_UINT8_T
	#define U_HAVE_UINT8_T 1	#define U_HAVE_UINT8_T 1
	#endif	#endif

	#ifndef U_HAVE_INT16_T	#ifndef U_HAVE_INT16_T

End of changes. 2 change blocks.
	1 lines changed or deleted	13 lines changed or added

	putil.h	putil.h
	/*	/*
	************************************************************************* *	************************************************************************* *
	*	*

	* Copyright (C) 1997-2008, International Business Machines	* Copyright (C) 1997-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	*	*
	************************************************************************* *	************************************************************************* *
	*	*
	* FILE NAME : putil.h	* FILE NAME : putil.h
	*	*
	* Date Name Description	* Date Name Description
	* 05/14/98 nos Creation (content moved here from utypes.h).	* 05/14/98 nos Creation (content moved here from utypes.h).
	* 06/17/99 erm Added IEEE_754	* 06/17/99 erm Added IEEE_754
	* 07/22/98 stephen Added IEEEremainder, max, min, trunc	* 07/22/98 stephen Added IEEEremainder, max, min, trunc

	skipping to change at line 96	skipping to change at line 96
	* This function is not thread-safe. Use it before calling ICU APIs from	* This function is not thread-safe. Use it before calling ICU APIs from
	* multiple threads.	* multiple threads.
	*	*
	* @param directory The directory to be set.	* @param directory The directory to be set.
	*	*
	* @see u_init	* @see u_init
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE void U_EXPORT2 u_setDataDirectory(const char *directory);	U_STABLE void U_EXPORT2 u_setDataDirectory(const char *directory);


		#if !U_CHARSET_IS_UTF8
	/**	/**
	* Please use ucnv_getDefaultName() instead.	* Please use ucnv_getDefaultName() instead.
	* Return the default codepage for this platform and locale.	* Return the default codepage for this platform and locale.
	* This function can call setlocale() on Unix platforms. Please read the	* This function can call setlocale() on Unix platforms. Please read the
	* platform documentation on setlocale() before calling this function.	* platform documentation on setlocale() before calling this function.
	* @return the default codepage for this platform	* @return the default codepage for this platform
	* @internal	* @internal
	*/	*/
	U_INTERNAL const char* U_EXPORT2 uprv_getDefaultCodepage(void);	U_INTERNAL const char* U_EXPORT2 uprv_getDefaultCodepage(void);

		#endif

	/**	/**
	* Please use uloc_getDefault() instead.	* Please use uloc_getDefault() instead.
	* Return the default locale ID string by querying ths system, or	* Return the default locale ID string by querying ths system, or
	* zero if one cannot be found.	* zero if one cannot be found.
	* This function can call setlocale() on Unix platforms. Please read the	* This function can call setlocale() on Unix platforms. Please read the
	* platform documentation on setlocale() before calling this function.	* platform documentation on setlocale() before calling this function.
	* @return the default locale ID string	* @return the default locale ID string
	* @internal	* @internal
	*/	*/

End of changes. 3 change blocks.
	1 lines changed or deleted	3 lines changed or added

	pwin32.h	pwin32.h

	skipping to change at line 31	skipping to change at line 31
	* \brief Configuration constants for the Windows platform	* \brief Configuration constants for the Windows platform
	*/	*/

	/** Define the platform we're on. */	/** Define the platform we're on. */
	#ifndef U_WINDOWS	#ifndef U_WINDOWS
	#define U_WINDOWS	#define U_WINDOWS
	#endif	#endif

	#if defined(__BORLANDC__)	#if defined(__BORLANDC__)
	#define U_HAVE_PLACEMENT_NEW 0	#define U_HAVE_PLACEMENT_NEW 0

	#define U_HAVE_INTTYPES_H 1
	#define __STDC_CONSTANT_MACROS	#define __STDC_CONSTANT_MACROS
	#endif	#endif

	/** _MSC_VER is used to detect the Microsoft compiler. */	/** _MSC_VER is used to detect the Microsoft compiler. */
	#if defined(_MSC_VER)	#if defined(_MSC_VER)
	#define U_INT64_IS_LONG_LONG 0	#define U_INT64_IS_LONG_LONG 0
	#else	#else
	#define U_INT64_IS_LONG_LONG 1	#define U_INT64_IS_LONG_LONG 1
	#endif	#endif

	/** Define whether inttypes.h is available */	/** Define whether inttypes.h is available */
	#ifndef U_HAVE_INTTYPES_H	#ifndef U_HAVE_INTTYPES_H

	#define U_HAVE_INTTYPES_H 0	# if defined(__BORLANDC__) \|\| defined(__MINGW32__)
		# define U_HAVE_INTTYPES_H 1
		# else
		# define U_HAVE_INTTYPES_H 0
		# endif
	#endif	#endif

	/**	/**
	* Define what support for C++ streams is available.	* Define what support for C++ streams is available.
	* If U_IOSTREAM_SOURCE is set to 199711, then <iostream> is avai lable	* If U_IOSTREAM_SOURCE is set to 199711, then <iostream> is avai lable
	* (1997711 is the date the ISO/IEC C++ FDIS was published), and then	* (1997711 is the date the ISO/IEC C++ FDIS was published), and then
	* one should qualify streams using the std namespace in ICU header	* one should qualify streams using the std namespace in ICU header
	* files.	* files.
	* If U_IOSTREAM_SOURCE is set to 198506, then <iostream.h> is	* If U_IOSTREAM_SOURCE is set to 198506, then <iostream.h> is
	* available instead (198506 is the date when Stroustrup published	* available instead (198506 is the date when Stroustrup published

	skipping to change at line 213	skipping to change at line 216
	#ifdef NDEBUG	#ifdef NDEBUG
	#define U_RELEASE 1	#define U_RELEASE 1
	#else	#else
	#define U_RELEASE 0	#define U_RELEASE 0
	#endif	#endif
	#endif	#endif

	/** Determine whether to disable renaming or not. This overrides the	/** Determine whether to disable renaming or not. This overrides the
	setting in umachine.h which is for all platforms. */	setting in umachine.h which is for all platforms. */
	#ifndef U_DISABLE_RENAMING	#ifndef U_DISABLE_RENAMING

	#define U_DISABLE_RENAMING 0	#define U_DISABLE_RENAMING 1
	#endif	#endif

	/** Determine whether to override new and delete. */	/** Determine whether to override new and delete. */
	#ifndef U_OVERRIDE_CXX_ALLOCATION	#ifndef U_OVERRIDE_CXX_ALLOCATION
	#define U_OVERRIDE_CXX_ALLOCATION 1	#define U_OVERRIDE_CXX_ALLOCATION 1
	#endif	#endif
	/** Determine whether to override placement new and delete for STL. */	/** Determine whether to override placement new and delete for STL. */
	#ifndef U_HAVE_PLACEMENT_NEW	#ifndef U_HAVE_PLACEMENT_NEW
	#define U_HAVE_PLACEMENT_NEW 1	#define U_HAVE_PLACEMENT_NEW 1
	#endif	#endif

End of changes. 3 change blocks.
	3 lines changed or deleted	6 lines changed or added

	rbnf.h	rbnf.h

	skipping to change at line 996	skipping to change at line 996

	private:	private:
	NFRuleSet **ruleSets;	NFRuleSet **ruleSets;
	NFRuleSet *defaultRuleSet;	NFRuleSet *defaultRuleSet;
	Locale locale;	Locale locale;
	Collator* collator;	Collator* collator;
	DecimalFormatSymbols* decimalFormatSymbols;	DecimalFormatSymbols* decimalFormatSymbols;
	UBool lenient;	UBool lenient;
	UnicodeString* lenientParseRules;	UnicodeString* lenientParseRules;
	LocalizationInfo* localizations;	LocalizationInfo* localizations;


		// Temporary workaround - when noParse is true, do noting in parse.
		// TODO: We need a real fix - see #6895/#6896
		UBool noParse;
	};	};

	// ---------------	// ---------------

	inline UnicodeString&	inline UnicodeString&
	RuleBasedNumberFormat::format(const Formattable& obj,	RuleBasedNumberFormat::format(const Formattable& obj,
	UnicodeString& result,	UnicodeString& result,
	UErrorCode& status) const	UErrorCode& status) const
	{	{
	// Don't use Format:: - use immediate base class only,	// Don't use Format:: - use immediate base class only,

End of changes. 1 change blocks.
	0 lines changed or deleted	4 lines changed or added

	smpdtfmt.h	smpdtfmt.h

	skipping to change at line 241	skipping to change at line 241
	* [Note:] Not all locales support SimpleDateFormat; for full generalit y,	* [Note:] Not all locales support SimpleDateFormat; for full generalit y,
	* use the factory methods in the DateFormat class.	* use the factory methods in the DateFormat class.
	* @param pattern the pattern for the format.	* @param pattern the pattern for the format.
	* @param status Output param set to success/failure code.	* @param status Output param set to success/failure code.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	SimpleDateFormat(const UnicodeString& pattern,	SimpleDateFormat(const UnicodeString& pattern,
	UErrorCode& status);	UErrorCode& status);

	/**	/**

		* Construct a SimpleDateFormat using the given pattern, numbering syst
		em override, and the default locale.
		* The locale is used to obtain the symbols used in formatting (e.g., t
		he
		* names of the months), but not to provide the pattern.
		* <P>
		* A numbering system override is a string containing either the name o
		f a known numbering system,
		* or a set of field and numbering system pairs that specify which fiel
		ds are to be formattied with
		* the alternate numbering system. For example, to specify that all nu
		meric fields in the specified
		* date or time pattern are to be rendered using Thai digits, simply sp
		ecify the numbering system override
		* as "thai". To specify that just the year portion of the date be for
		matted using Hebrew numbering,
		* use the override string "y=hebrew". Numbering system overrides can
		be combined using a semi-colon
		* character in the override string, such as "d=decimal;M=arabic;y=hebr
		ew", etc.
		*
		* <P>
		* [Note:] Not all locales support SimpleDateFormat; for full generalit
		y,
		* use the factory methods in the DateFormat class.
		* @param pattern the pattern for the format.
		* @param override the override string.
		* @param status Output param set to success/failure code.
		* @draft ICU 4.2
		*/
		SimpleDateFormat(const UnicodeString& pattern,
		const UnicodeString& override,
		UErrorCode& status);

		/**
	* Construct a SimpleDateFormat using the given pattern and locale.	* Construct a SimpleDateFormat using the given pattern and locale.
	* The locale is used to obtain the symbols used in formatting (e.g., t he	* The locale is used to obtain the symbols used in formatting (e.g., t he
	* names of the months), but not to provide the pattern.	* names of the months), but not to provide the pattern.
	* <P>	* <P>
	* [Note:] Not all locales support SimpleDateFormat; for full generalit y,	* [Note:] Not all locales support SimpleDateFormat; for full generalit y,
	* use the factory methods in the DateFormat class.	* use the factory methods in the DateFormat class.
	* @param pattern the pattern for the format.	* @param pattern the pattern for the format.
	* @param locale the given locale.	* @param locale the given locale.
	* @param status Output param set to success/failure code.	* @param status Output param set to success/failure code.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	SimpleDateFormat(const UnicodeString& pattern,	SimpleDateFormat(const UnicodeString& pattern,
	const Locale& locale,	const Locale& locale,
	UErrorCode& status);	UErrorCode& status);

	/**	/**

		* Construct a SimpleDateFormat using the given pattern, numbering syst
		em override, and locale.
		* The locale is used to obtain the symbols used in formatting (e.g., t
		he
		* names of the months), but not to provide the pattern.
		* <P>
		* A numbering system override is a string containing either the name o
		f a known numbering system,
		* or a set of field and numbering system pairs that specify which fiel
		ds are to be formattied with
		* the alternate numbering system. For example, to specify that all nu
		meric fields in the specified
		* date or time pattern are to be rendered using Thai digits, simply sp
		ecify the numbering system override
		* as "thai". To specify that just the year portion of the date be for
		matted using Hebrew numbering,
		* use the override string "y=hebrew". Numbering system overrides can
		be combined using a semi-colon
		* character in the override string, such as "d=decimal;M=arabic;y=hebr
		ew", etc.
		* <P>
		* [Note:] Not all locales support SimpleDateFormat; for full generalit
		y,
		* use the factory methods in the DateFormat class.
		* @param pattern the pattern for the format.
		* @param override the numbering system override.
		* @param locale the given locale.
		* @param status Output param set to success/failure code.
		* @draft ICU 4.2
		*/
		SimpleDateFormat(const UnicodeString& pattern,
		const UnicodeString& override,
		const Locale& locale,
		UErrorCode& status);

		/**
	* Construct a SimpleDateFormat using the given pattern and locale-spec ific	* Construct a SimpleDateFormat using the given pattern and locale-spec ific
	* symbol data. The formatter takes ownership of the DateFormatSymbols object;	* symbol data. The formatter takes ownership of the DateFormatSymbols object;
	* the caller is no longer responsible for deleting it.	* the caller is no longer responsible for deleting it.
	* @param pattern the given pattern for the format.	* @param pattern the given pattern for the format.
	* @param formatDataToAdopt the symbols to be adopted.	* @param formatDataToAdopt the symbols to be adopted.
	* @param status Output param set to success/faulure code.	* @param status Output param set to success/faulure code.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	SimpleDateFormat(const UnicodeString& pattern,	SimpleDateFormat(const UnicodeString& pattern,
	DateFormatSymbols* formatDataToAdopt,	DateFormatSymbols* formatDataToAdopt,

	skipping to change at line 899	skipping to change at line 950
	void initNumberFormatters(const Locale &locale,UErrorCode &status);	void initNumberFormatters(const Locale &locale,UErrorCode &status);

	/**	/**
	* Get the numbering system to be used for a particular field.	* Get the numbering system to be used for a particular field.
	*/	*/
	NumberFormat * getNumberFormat(UDateFormatField index) const;	NumberFormat * getNumberFormat(UDateFormatField index) const;

	/**	/**
	* Parse the given override string and set up structures for number for mats	* Parse the given override string and set up structures for number for mats
	*/	*/

	void processOverrideString(const Locale &locale, UnicodeString &str, in t8_t type, UErrorCode &status);	void processOverrideString(const Locale &locale, const UnicodeString &s tr, int8_t type, UErrorCode &status);

	/**	/**
	* Used to map pattern characters to Calendar field identifiers.	* Used to map pattern characters to Calendar field identifiers.
	*/	*/
	static const UCalendarDateFields fgPatternIndexToCalendarField[];	static const UCalendarDateFields fgPatternIndexToCalendarField[];

	/**	/**
	* Map index into pattern character string to DateFormat field number	* Map index into pattern character string to DateFormat field number
	*/	*/
	static const UDateFormatField fgPatternIndexToDateFormatField[];	static const UDateFormatField fgPatternIndexToDateFormatField[];

	skipping to change at line 978	skipping to change at line 1029

	typedef struct NSOverride {	typedef struct NSOverride {
	NumberFormat *nf;	NumberFormat *nf;
	int32_t hash;	int32_t hash;
	NSOverride *next;	NSOverride *next;
	} NSOverride;	} NSOverride;

	/*	/*
	* MessageFormat instances used for localized GMT format	* MessageFormat instances used for localized GMT format
	*/	*/

		enum {
		kGMTNegativeHMS = 0,
		kGMTNegativeHM,
		kGMTPositiveHMS,
		kGMTPositiveHM,

		kNumGMTFormatters
		};
		enum {
		kGMTNegativeHMSMinLenIdx = 0,
		kGMTPositiveHMSMinLenIdx,

		kNumGMTFormatMinLengths
		};

	MessageFormat **fGMTFormatters;	MessageFormat **fGMTFormatters;

		// If a GMT hour format has a second field, we need to make sure
		// the length of input localized GMT string must match the expected
		// length. Otherwise, sub DateForamt handling offset format may
		// unexpectedly success parsing input GMT string without second field.
		// See #6880 about this issue.
		// TODO: SimpleDateFormat should provide an option to invalidate
		//
		int32_t fGMTFormatHmsMinLen[kNumGMTFormatMinLengths];

	NumberFormat **fNumberFormatters;	NumberFormat **fNumberFormatters;

	NSOverride *fOverrideList;	NSOverride *fOverrideList;

	UBool fHaveDefaultCentury;	UBool fHaveDefaultCentury;
	};	};

	inline UDate	inline UDate
	SimpleDateFormat::get2DigitYearStart(UErrorCode& /status/) const	SimpleDateFormat::get2DigitYearStart(UErrorCode& /status/) const

End of changes. 5 change blocks.
	1 lines changed or deleted	95 lines changed or added

	tblcoll.h	tblcoll.h
	/*	/*
	************************************************************************* *	************************************************************************* *

	* Copyright (C) 1996-2008, International Business Machines Corporation and	* Copyright (C) 1996-2009, International Business Machines Corporation and
	* others. All Rights Reserved.	* others. All Rights Reserved.
	************************************************************************* *	************************************************************************* *
	*/	*/

	/**	/**
	* \file	* \file
	* \brief C++ API: RuleBasedCollator class provides the simple implementati on of Collator.	* \brief C++ API: RuleBasedCollator class provides the simple implementati on of Collator.
	*/	*/

	/**	/**

	skipping to change at line 389	skipping to change at line 389
	* @return Returns an enum value. UCOL_GREATER if source is greater	* @return Returns an enum value. UCOL_GREATER if source is greater
	* than target; UCOL_EQUAL if source is equal to target; UCOL_LESS if so urce is less	* than target; UCOL_EQUAL if source is equal to target; UCOL_LESS if so urce is less
	* than target	* than target
	* @stable ICU 2.6	* @stable ICU 2.6
	*/	*/
	virtual UCollationResult compare(const UChar* source, int32_t sourceLen gth,	virtual UCollationResult compare(const UChar* source, int32_t sourceLen gth,
	const UChar* target, int32_t targetLe ngth,	const UChar* target, int32_t targetLe ngth,
	UErrorCode &status) const;	UErrorCode &status) const;

	/**	/**

		* Compares two strings using the Collator.
		* Returns whether the first one compares less than/equal to/greater th
		an
		* the second one.
		* This version takes UCharIterator input.
		* @param sIter the first ("source") string iterator
		* @param tIter the second ("target") string iterator
		* @param status ICU status
		* @return UCOL_LESS, UCOL_EQUAL or UCOL_GREATER
		* @draft ICU 4.2
		*/
		virtual UCollationResult compare(UCharIterator &sIter,
		UCharIterator &tIter,
		UErrorCode &status) const;

		/**
	* Transforms a specified region of the string into a series of characte rs	* Transforms a specified region of the string into a series of characte rs
	* that can be compared with CollationKey.compare. Use a CollationKey wh en	* that can be compared with CollationKey.compare. Use a CollationKey wh en
	* you need to do repeated comparisions on the same string. For a single	* you need to do repeated comparisions on the same string. For a single
	* comparison the compare method will be faster.	* comparison the compare method will be faster.
	* @param source the source string.	* @param source the source string.
	* @param key the transformed key of the source string.	* @param key the transformed key of the source string.
	* @param status the error code status.	* @param status the error code status.
	* @return the transformed key.	* @return the transformed key.
	* @see CollationKey	* @see CollationKey
	* @deprecated ICU 2.8 Use getSortKey(...) instead	* @deprecated ICU 2.8 Use getSortKey(...) instead

End of changes. 2 change blocks.
	1 lines changed or deleted	17 lines changed or added

	tmunit.h	tmunit.h
	/*	/*
	************************************************************************ ***	************************************************************************ ***

	* Copyright (C) 2008, Google, International Business Machines Corporation and *	* Copyright (C) 2009, Google, International Business Machines Corporation and *
	* others. All Rights Reserved. *	* others. All Rights Reserved. *
	************************************************************************ ***	************************************************************************ ***
	*/	*/

	#ifndef __TMUNIT_H__	#ifndef __TMUNIT_H__
	#define __TMUNIT_H__	#define __TMUNIT_H__

	/**	/**
	* \file	* \file
	* \brief C++ API: time unit object	* \brief C++ API: time unit object
	*/	*/


	#if !UCONFIG_NO_FORMATTING

	#include "unicode/measunit.h"	#include "unicode/measunit.h"


		#if !UCONFIG_NO_FORMATTING

	U_NAMESPACE_BEGIN	U_NAMESPACE_BEGIN

	/**	/**
	* Measurement unit for time units.	* Measurement unit for time units.
	* @see TimeUnitAmount	* @see TimeUnitAmount
	* @see TimeUnit	* @see TimeUnit
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	class U_I18N_API TimeUnit: public MeasureUnit {	class U_I18N_API TimeUnit: public MeasureUnit {
	public:	public:

End of changes. 3 change blocks.
	3 lines changed or deleted	3 lines changed or added

	tmutamt.h	tmutamt.h
	/*	/*
	************************************************************************ ***	************************************************************************ ***

	* Copyright (C) 2008, Google, International Business Machines Corporation and *	* Copyright (C) 2009, Google, International Business Machines Corporation and *
	* others. All Rights Reserved. *	* others. All Rights Reserved. *
	************************************************************************ ***	************************************************************************ ***
	*/	*/

	#ifndef __TMUTAMT_H__	#ifndef __TMUTAMT_H__
	#define __TMUTAMT_H__	#define __TMUTAMT_H__

	/**	/**
	* \file	* \file
	* \brief C++ API: time unit amount object.	* \brief C++ API: time unit amount object.
	*/	*/


	#if !UCONFIG_NO_FORMATTING

	#include "unicode/measure.h"	#include "unicode/measure.h"
	#include "unicode/tmunit.h"	#include "unicode/tmunit.h"


		#if !UCONFIG_NO_FORMATTING

	U_NAMESPACE_BEGIN	U_NAMESPACE_BEGIN

	/**	/**
	* Express a duration as a time unit and number. Patterned after Currency.	* Express a duration as a time unit and number. Patterned after Currency.
	* @see TimeUnitAmount	* @see TimeUnitAmount
	* @see TimeUnitFormat	* @see TimeUnitFormat
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	class U_I18N_API TimeUnitAmount: public Measure {	class U_I18N_API TimeUnitAmount: public Measure {
	public:	public:

End of changes. 3 change blocks.
	3 lines changed or deleted	3 lines changed or added

	ubrk.h	ubrk.h
	/*	/*
	************************************************************************* *	************************************************************************* *

	* Copyright (C) 1996-2007, International Business Machines Corporation and others.	* Copyright (C) 1996-2009, International Business Machines Corporation and others.
	* All Rights Reserved.	* All Rights Reserved.
	************************************************************************* *	************************************************************************* *
	*/	*/

	#ifndef UBRK_H	#ifndef UBRK_H
	#define UBRK_H	#define UBRK_H

	#include "unicode/utypes.h"	#include "unicode/utypes.h"
	#include "unicode/uloc.h"	#include "unicode/uloc.h"
	#include "unicode/utext.h"	#include "unicode/utext.h"

	skipping to change at line 58	skipping to change at line 58
	* interpretation of periods within numbers and abbreviations, and	* interpretation of periods within numbers and abbreviations, and
	* trailing punctuation marks such as quotation marks and parentheses.	* trailing punctuation marks such as quotation marks and parentheses.
	* <p>	* <p>
	* Word boundary analysis is used by search and replace functions, as	* Word boundary analysis is used by search and replace functions, as
	* well as within text editing applications that allow the user to	* well as within text editing applications that allow the user to
	* select words with a double click. Word selection provides correct	* select words with a double click. Word selection provides correct
	* interpretation of punctuation marks within and following	* interpretation of punctuation marks within and following
	* words. Characters that are not part of a word, such as symbols or	* words. Characters that are not part of a word, such as symbols or
	* punctuation marks, have word-breaks on both sides.	* punctuation marks, have word-breaks on both sides.
	* <p>	* <p>

	* Character boundary analysis allows users to interact with	* Character boundary analysis identifies the boundaries of
	* characters as they expect to, for example, when moving the cursor	* "Extended Grapheme Clusters", which are groupings of codepoints
	* through a text string. Character boundary analysis provides correct	* that should be treated as character-like units for many text operations.
	* navigation of through character strings, regardless of how the	* Please see Unicode Standard Annex #29, Unicode Text Segmentation,
	* character is stored. For example, an accented character might be	* http://www.unicode.org/reports/tr29/ for additional information
	* stored as a base character and a diacritical mark. What users	* on grapheme clusters and guidelines on their use.
	* consider to be a character can differ between languages.
	* <p>	* <p>
	* Title boundary analysis locates all positions,	* Title boundary analysis locates all positions,
	* typically starts of words, that should be set to Title Case	* typically starts of words, that should be set to Title Case
	* when title casing the text.	* when title casing the text.
	* <p>	* <p>
	* The text boundary positions are found according to the rules	* The text boundary positions are found according to the rules
	* described in Unicode Standard Annex #29, Text Boundaries, and	* described in Unicode Standard Annex #29, Text Boundaries, and
	* Unicode Standard Annex #14, Line Breaking Properties. These	* Unicode Standard Annex #14, Line Breaking Properties. These
	* are available at http://www.unicode.org/reports/tr14/ and	* are available at http://www.unicode.org/reports/tr14/ and
	* http://www.unicode.org/reports/tr29/.	* http://www.unicode.org/reports/tr29/.

End of changes. 2 change blocks.
	8 lines changed or deleted	7 lines changed or added

	ucasemap.h	ucasemap.h
	/*	/*
	************************************************************************* **	************************************************************************* **
	*	*

	* Copyright (C) 2005-2008, International Business Machines	* Copyright (C) 2005-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	*	*
	************************************************************************* **	************************************************************************* **
	* file name: ucasemap.h	* file name: ucasemap.h
	* encoding: US-ASCII	* encoding: US-ASCII
	* tab size: 8 (not used)	* tab size: 8 (not used)
	* indentation:4	* indentation:4
	*	*
	* created on: 2005may06	* created on: 2005may06
	* created by: Markus W. Scherer	* created by: Markus W. Scherer

	skipping to change at line 125	skipping to change at line 125
	* @param options Options bit set, see ucasemap_open().	* @param options Options bit set, see ucasemap_open().
	* @param pErrorCode Must be a valid pointer to an error code value,	* @param pErrorCode Must be a valid pointer to an error code value,
	* which must not indicate a failure before the function call.	* which must not indicate a failure before the function call.
	*	*
	* @see ucasemap_open	* @see ucasemap_open
	* @stable ICU 3.4	* @stable ICU 3.4
	*/	*/
	U_STABLE void U_EXPORT2	U_STABLE void U_EXPORT2
	ucasemap_setOptions(UCaseMap csm, uint32_t options, UErrorCode pErrorCode );	ucasemap_setOptions(UCaseMap csm, uint32_t options, UErrorCode pErrorCode );


	#ifndef U_HIDE_DRAFT_API

	/**	/**
	* Do not lowercase non-initial parts of words when titlecasing.	* Do not lowercase non-initial parts of words when titlecasing.
	* Option bit for titlecasing APIs that take an options bit set.	* Option bit for titlecasing APIs that take an options bit set.
	*	*
	* By default, titlecasing will titlecase the first cased character	* By default, titlecasing will titlecase the first cased character
	* of a word and lowercase all other characters.	* of a word and lowercase all other characters.
	* With this option, the other characters will not be modified.	* With this option, the other characters will not be modified.
	*	*
	* @see ucasemap_setOptions	* @see ucasemap_setOptions
	* @see ucasemap_toTitle	* @see ucasemap_toTitle

	skipping to change at line 168	skipping to change at line 166
	*	*
	* @see ucasemap_setOptions	* @see ucasemap_setOptions
	* @see ucasemap_toTitle	* @see ucasemap_toTitle
	* @see ucasemap_utf8ToTitle	* @see ucasemap_utf8ToTitle
	* @see UnicodeString::toTitle	* @see UnicodeString::toTitle
	* @see U_TITLECASE_NO_LOWERCASE	* @see U_TITLECASE_NO_LOWERCASE
	* @stable ICU 3.8	* @stable ICU 3.8
	*/	*/
	#define U_TITLECASE_NO_BREAK_ADJUSTMENT 0x200	#define U_TITLECASE_NO_BREAK_ADJUSTMENT 0x200


	#endif

	#if !UCONFIG_NO_BREAK_ITERATION	#if !UCONFIG_NO_BREAK_ITERATION

	/**	/**
	* Get the break iterator that is used for titlecasing.	* Get the break iterator that is used for titlecasing.
	* Do not modify the returned break iterator.	* Do not modify the returned break iterator.
	* @param csm UCaseMap service object.	* @param csm UCaseMap service object.
	* @return titlecasing break iterator	* @return titlecasing break iterator
	* @stable ICU 3.8	* @stable ICU 3.8
	*/	*/
	U_DRAFT const UBreakIterator * U_EXPORT2	U_DRAFT const UBreakIterator * U_EXPORT2

	skipping to change at line 216	skipping to change at line 212
	* Titlecase a UTF-16 string. This function is almost a duplicate of u_strT oTitle(),	* Titlecase a UTF-16 string. This function is almost a duplicate of u_strT oTitle(),
	* except that it takes ucasemap_setOptions() into account and has performa nce	* except that it takes ucasemap_setOptions() into account and has performa nce
	* advantages from being able to use a UCaseMap object for multiple case ma pping	* advantages from being able to use a UCaseMap object for multiple case ma pping
	* operations, saving setup time.	* operations, saving setup time.
	*	*
	* Casing is locale-dependent and context-sensitive.	* Casing is locale-dependent and context-sensitive.
	* Titlecasing uses a break iterator to find the first characters of words	* Titlecasing uses a break iterator to find the first characters of words
	* that are to be titlecased. It titlecases those characters and lowercases	* that are to be titlecased. It titlecases those characters and lowercases
	* all others. (This can be modified with ucasemap_setOptions().)	* all others. (This can be modified with ucasemap_setOptions().)
	*	*

		* Note: This function takes a non-const UCaseMap pointer because it will
		* open a default break iterator if no break iterator was set yet,
		* and effectively call ucasemap_setBreakIterator();
		* also because the break iterator is stateful and will be modified during
		* the iteration.
		*
	* The titlecase break iterator can be provided to customize for arbitrary	* The titlecase break iterator can be provided to customize for arbitrary
	* styles, using rules and dictionaries beyond the standard iterators.	* styles, using rules and dictionaries beyond the standard iterators.

	* It may be more efficient to always provide an iterator to avoid
	* opening and closing one for each string.
	* The standard titlecase iterator for the root locale implements the	* The standard titlecase iterator for the root locale implements the
	* algorithm of Unicode TR 21.	* algorithm of Unicode TR 21.
	*	*

	* This function uses only the setText(), first() and next() methods of the	* This function uses only the setUText(), first(), next() and close() meth ods of the
	* provided break iterator.	* provided break iterator.
	*	*
	* The result may be longer or shorter than the original.	* The result may be longer or shorter than the original.
	* The source string and the destination buffer must not overlap.	* The source string and the destination buffer must not overlap.
	*	*

	* @param csm UCaseMap service object.	* @param csm UCaseMap service object. This pointer is non-const!
		* See the note above for details.
	* @param dest A buffer for the result string. The result will be NUL- terminated if	* @param dest A buffer for the result string. The result will be NUL- terminated if
	* the buffer is large enough.	* the buffer is large enough.
	* The contents is undefined in case of failure.	* The contents is undefined in case of failure.
	* @param destCapacity The size of the buffer (number of bytes). If it is 0 , then	* @param destCapacity The size of the buffer (number of bytes). If it is 0 , then
	* dest may be NULL and the function will only return the length of the result	* dest may be NULL and the function will only return the length of the result
	* without writing any of the result string.	* without writing any of the result string.
	* @param src The original string.	* @param src The original string.
	* @param srcLength The length of the original string. If -1, then src must be NUL-terminated.	* @param srcLength The length of the original string. If -1, then src must be NUL-terminated.
	* @param pErrorCode Must be a valid pointer to an error code value,	* @param pErrorCode Must be a valid pointer to an error code value,
	* which must not indicate a failure before the function c all.	* which must not indicate a failure before the function c all.

	skipping to change at line 321	skipping to change at line 322

	#if !UCONFIG_NO_BREAK_ITERATION	#if !UCONFIG_NO_BREAK_ITERATION

	/**	/**
	* Titlecase a UTF-8 string.	* Titlecase a UTF-8 string.
	* Casing is locale-dependent and context-sensitive.	* Casing is locale-dependent and context-sensitive.
	* Titlecasing uses a break iterator to find the first characters of words	* Titlecasing uses a break iterator to find the first characters of words
	* that are to be titlecased. It titlecases those characters and lowercases	* that are to be titlecased. It titlecases those characters and lowercases
	* all others. (This can be modified with ucasemap_setOptions().)	* all others. (This can be modified with ucasemap_setOptions().)
	*	*

		* Note: This function takes a non-const UCaseMap pointer because it will
		* open a default break iterator if no break iterator was set yet,
		* and effectively call ucasemap_setBreakIterator();
		* also because the break iterator is stateful and will be modified during
		* the iteration.
		*
	* The titlecase break iterator can be provided to customize for arbitrary	* The titlecase break iterator can be provided to customize for arbitrary
	* styles, using rules and dictionaries beyond the standard iterators.	* styles, using rules and dictionaries beyond the standard iterators.

	* It may be more efficient to always provide an iterator to avoid
	* opening and closing one for each string.
	* The standard titlecase iterator for the root locale implements the	* The standard titlecase iterator for the root locale implements the
	* algorithm of Unicode TR 21.	* algorithm of Unicode TR 21.
	*	*

	* This function uses only the setText(), first() and next() methods of the	* This function uses only the setUText(), first(), next() and close() meth ods of the
	* provided break iterator.	* provided break iterator.
	*	*
	* The result may be longer or shorter than the original.	* The result may be longer or shorter than the original.
	* The source string and the destination buffer must not overlap.	* The source string and the destination buffer must not overlap.
	*	*

	* @param csm UCaseMap service object.	* @param csm UCaseMap service object. This pointer is non-const!
		* See the note above for details.
	* @param dest A buffer for the result string. The result will be NUL- terminated if	* @param dest A buffer for the result string. The result will be NUL- terminated if
	* the buffer is large enough.	* the buffer is large enough.
	* The contents is undefined in case of failure.	* The contents is undefined in case of failure.
	* @param destCapacity The size of the buffer (number of bytes). If it is 0 , then	* @param destCapacity The size of the buffer (number of bytes). If it is 0 , then
	* dest may be NULL and the function will only return the length of the result	* dest may be NULL and the function will only return the length of the result
	* without writing any of the result string.	* without writing any of the result string.
	* @param src The original string.	* @param src The original string.
	* @param srcLength The length of the original string. If -1, then src must be NUL-terminated.	* @param srcLength The length of the original string. If -1, then src must be NUL-terminated.
	* @param pErrorCode Must be a valid pointer to an error code value,	* @param pErrorCode Must be a valid pointer to an error code value,
	* which must not indicate a failure before the function c all.	* which must not indicate a failure before the function c all.

End of changes. 11 change blocks.
	13 lines changed or deleted	19 lines changed or added

	uchar.h	uchar.h
	/*	/*
	**********************************************************************	**********************************************************************

	* Copyright (C) 1997-2008, International Business Machines	* Copyright (C) 1997-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	**********************************************************************	**********************************************************************
	*	*
	* File UCHAR.H	* File UCHAR.H
	*	*
	* Modification History:	* Modification History:
	*	*
	* Date Name Description	* Date Name Description
	* 04/02/97 aliu Creation.	* 04/02/97 aliu Creation.
	* 03/29/99 helena Updated for C APIs.	* 03/29/99 helena Updated for C APIs.

	skipping to change at line 1258	skipping to change at line 1258
	UBLOCK_PHOENICIAN = 151, /[10900]/	UBLOCK_PHOENICIAN = 151, /[10900]/
	/** @stable ICU 3.6 */	/** @stable ICU 3.6 */
	UBLOCK_CUNEIFORM = 152, /[12000]/	UBLOCK_CUNEIFORM = 152, /[12000]/
	/** @stable ICU 3.6 */	/** @stable ICU 3.6 */
	UBLOCK_CUNEIFORM_NUMBERS_AND_PUNCTUATION = 153, /[12400]/	UBLOCK_CUNEIFORM_NUMBERS_AND_PUNCTUATION = 153, /[12400]/
	/** @stable ICU 3.6 */	/** @stable ICU 3.6 */
	UBLOCK_COUNTING_ROD_NUMERALS = 154, /[1D360]/	UBLOCK_COUNTING_ROD_NUMERALS = 154, /[1D360]/

	/* New blocks in Unicode 5.1 */	/* New blocks in Unicode 5.1 */


	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_SUNDANESE = 155, /[1B80]/	UBLOCK_SUNDANESE = 155, /[1B80]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_LEPCHA = 156, /[1C00]/	UBLOCK_LEPCHA = 156, /[1C00]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_OL_CHIKI = 157, /[1C50]/	UBLOCK_OL_CHIKI = 157, /[1C50]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_CYRILLIC_EXTENDED_A = 158, /[2DE0]/	UBLOCK_CYRILLIC_EXTENDED_A = 158, /[2DE0]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_VAI = 159, /[A500]/	UBLOCK_VAI = 159, /[A500]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_CYRILLIC_EXTENDED_B = 160, /[A640]/	UBLOCK_CYRILLIC_EXTENDED_B = 160, /[A640]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_SAURASHTRA = 161, /[A880]/	UBLOCK_SAURASHTRA = 161, /[A880]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_KAYAH_LI = 162, /[A900]/	UBLOCK_KAYAH_LI = 162, /[A900]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_REJANG = 163, /[A930]/	UBLOCK_REJANG = 163, /[A930]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_CHAM = 164, /[AA00]/	UBLOCK_CHAM = 164, /[AA00]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_ANCIENT_SYMBOLS = 165, /[10190]/	UBLOCK_ANCIENT_SYMBOLS = 165, /[10190]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_PHAISTOS_DISC = 166, /[101D0]/	UBLOCK_PHAISTOS_DISC = 166, /[101D0]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_LYCIAN = 167, /[10280]/	UBLOCK_LYCIAN = 167, /[10280]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_CARIAN = 168, /[102A0]/	UBLOCK_CARIAN = 168, /[102A0]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_LYDIAN = 169, /[10920]/	UBLOCK_LYDIAN = 169, /[10920]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_MAHJONG_TILES = 170, /[1F000]/	UBLOCK_MAHJONG_TILES = 170, /[1F000]/

	/** @draft ICU 4.0 */	/** @stable ICU 4.0 */
	UBLOCK_DOMINO_TILES = 171, /[1F030]/	UBLOCK_DOMINO_TILES = 171, /[1F030]/

	/** @stable ICU 2.0 */	/** @stable ICU 2.0 */
	UBLOCK_COUNT = 172,	UBLOCK_COUNT = 172,

	/** @stable ICU 2.0 */	/** @stable ICU 2.0 */
	UBLOCK_INVALID_CODE=-1	UBLOCK_INVALID_CODE=-1
	};	};

	/** @stable ICU 2.0 */	/** @stable ICU 2.0 */

	skipping to change at line 1466	skipping to change at line 1466
	U_JG_WAW,	U_JG_WAW,
	U_JG_YEH,	U_JG_YEH,
	U_JG_YEH_BARREE,	U_JG_YEH_BARREE,
	U_JG_YEH_WITH_TAIL,	U_JG_YEH_WITH_TAIL,
	U_JG_YUDH,	U_JG_YUDH,
	U_JG_YUDH_HE,	U_JG_YUDH_HE,
	U_JG_ZAIN,	U_JG_ZAIN,
	U_JG_FE, /*< @stable ICU 2.6 /	U_JG_FE, /*< @stable ICU 2.6 /
	U_JG_KHAPH, /*< @stable ICU 2.6 /	U_JG_KHAPH, /*< @stable ICU 2.6 /
	U_JG_ZHAIN, /*< @stable ICU 2.6 /	U_JG_ZHAIN, /*< @stable ICU 2.6 /

	U_JG_BURUSHASKI_YEH_BARREE, /*< @draft ICU 4.0 /	U_JG_BURUSHASKI_YEH_BARREE, /*< @stable ICU 4.0 /
	U_JG_COUNT	U_JG_COUNT
	} UJoiningGroup;	} UJoiningGroup;

	/**	/**
	* Grapheme Cluster Break constants.	* Grapheme Cluster Break constants.
	*	*
	* @see UCHAR_GRAPHEME_CLUSTER_BREAK	* @see UCHAR_GRAPHEME_CLUSTER_BREAK
	* @stable ICU 3.4	* @stable ICU 3.4
	*/	*/
	typedef enum UGraphemeClusterBreak {	typedef enum UGraphemeClusterBreak {

End of changes. 19 change blocks.
	19 lines changed or deleted	19 lines changed or added

	ucnv.h	ucnv.h
	/*	/*
	**********************************************************************	**********************************************************************

	* Copyright (C) 1999-2008, International Business Machines	* Copyright (C) 1999-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	**********************************************************************	**********************************************************************
	* ucnv.h:	* ucnv.h:
	* External APIs for the ICU's codeset conversion library	* External APIs for the ICU's codeset conversion library
	* Bertrand A. Damiba	* Bertrand A. Damiba
	*	*
	* Modification History:	* Modification History:
	*	*
	* Date Name Description	* Date Name Description
	* 04/04/99 helena Fixed internal header inclusion.	* 04/04/99 helena Fixed internal header inclusion.

	skipping to change at line 873	skipping to change at line 873
	UErrorCode* err);	UErrorCode* err);

	/**	/**
	* Selectors for Unicode sets that can be returned by ucnv_getUnicodeSet().	* Selectors for Unicode sets that can be returned by ucnv_getUnicodeSet().
	* @see ucnv_getUnicodeSet	* @see ucnv_getUnicodeSet
	* @stable ICU 2.6	* @stable ICU 2.6
	*/	*/
	typedef enum UConverterUnicodeSet {	typedef enum UConverterUnicodeSet {
	/** Select the set of roundtrippable Unicode code points. @stable ICU 2 .6 */	/** Select the set of roundtrippable Unicode code points. @stable ICU 2 .6 */
	UCNV_ROUNDTRIP_SET,	UCNV_ROUNDTRIP_SET,

	/** Select the set of Unicode code points with roundtrip or fallback ma ppings. @draft ICU 4.0 */	/** Select the set of Unicode code points with roundtrip or fallback ma ppings. @stable ICU 4.0 */
	UCNV_ROUNDTRIP_AND_FALLBACK_SET,	UCNV_ROUNDTRIP_AND_FALLBACK_SET,
	/** Number of UConverterUnicodeSet selectors. @stable ICU 2.6 */	/** Number of UConverterUnicodeSet selectors. @stable ICU 2.6 */
	UCNV_SET_COUNT	UCNV_SET_COUNT
	} UConverterUnicodeSet;	} UConverterUnicodeSet;

	/**	/**
	* Returns the set of Unicode code points that can be converted by an ICU c onverter.	* Returns the set of Unicode code points that can be converted by an ICU c onverter.
	*	*
	* Returns one of several kinds of set:	* Returns one of several kinds of set:
	*	*

	skipping to change at line 1365	skipping to change at line 1365
	*	*
	* utf8Cnv=myGetCachedUTF8Converter(pErrorCode);	* utf8Cnv=myGetCachedUTF8Converter(pErrorCode);
	* if(U_FAILURE(*pErrorCode)) {	* if(U_FAILURE(*pErrorCode)) {
	* return 0;	* return 0;
	* }	* }
	*	*
	* if(length<0) {	* if(length<0) {
	* length=strlen(s);	* length=strlen(s);
	* }	* }
	* target=u8;	* target=u8;

	* ucnv_convertEx(cnv, utf8Cnv,	* ucnv_convertEx(utf8Cnv, cnv,
	* &target, u8+capacity,	* &target, u8+capacity,
	* &s, s+length,	* &s, s+length,
	* NULL, NULL, NULL, NULL,	* NULL, NULL, NULL, NULL,
	* TRUE, TRUE,	* TRUE, TRUE,
	* pErrorCode);	* pErrorCode);
	*	*
	* myReleaseCachedUTF8Converter(utf8Cnv);	* myReleaseCachedUTF8Converter(utf8Cnv);
	*	*
	* // return the output string length, but without preflighting	* // return the output string length, but without preflighting
	* return (int32_t)(target-u8);	* return (int32_t)(target-u8);

	skipping to change at line 1789	skipping to change at line 1789
	*/	*/
	U_STABLE const char * U_EXPORT2	U_STABLE const char * U_EXPORT2
	ucnv_getCanonicalName(const char alias, const char standard, UErrorCode * pErrorCode);	ucnv_getCanonicalName(const char alias, const char standard, UErrorCode * pErrorCode);

	/**	/**
	* Returns the current default converter name. If you want to open	* Returns the current default converter name. If you want to open
	* a default converter, you do not need to use this function.	* a default converter, you do not need to use this function.
	* It is faster if you pass a NULL argument to ucnv_open the	* It is faster if you pass a NULL argument to ucnv_open the
	* default converter.	* default converter.
	*	*

		* If U_CHARSET_IS_UTF8 is defined to 1 in utypes.h then this function
		* always returns "UTF-8".
		*
	* @return returns the current default converter name.	* @return returns the current default converter name.
	* Storage owned by the library	* Storage owned by the library
	* @see ucnv_setDefaultName	* @see ucnv_setDefaultName
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE const char * U_EXPORT2	U_STABLE const char * U_EXPORT2
	ucnv_getDefaultName(void);	ucnv_getDefaultName(void);

	/**	/**
	* This function is not thread safe. DO NOT call this function when ANY ICU	* This function is not thread safe. DO NOT call this function when ANY ICU
	* function is being used from more than one thread! This function sets the	* function is being used from more than one thread! This function sets the
	* current default converter name. If this function needs to be called, it	* current default converter name. If this function needs to be called, it
	* should be called during application initialization. Most of the time, th e	* should be called during application initialization. Most of the time, th e
	* results from ucnv_getDefaultName() or ucnv_open with a NULL string argum ent	* results from ucnv_getDefaultName() or ucnv_open with a NULL string argum ent
	* is sufficient for your application.	* is sufficient for your application.

		*
		* If U_CHARSET_IS_UTF8 is defined to 1 in utypes.h then this function
		* does nothing.
		*
	* @param name the converter name to be the default (must be known by ICU).	* @param name the converter name to be the default (must be known by ICU).
	* @see ucnv_getDefaultName	* @see ucnv_getDefaultName
	* @system	* @system
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE void U_EXPORT2	U_STABLE void U_EXPORT2
	ucnv_setDefaultName(const char *name);	ucnv_setDefaultName(const char *name);

	/**	/**
	* Fixes the backslash character mismapping. For example, in SJIS, the bac kslash	* Fixes the backslash character mismapping. For example, in SJIS, the bac kslash

End of changes. 5 change blocks.
	3 lines changed or deleted	10 lines changed or added

	ucnv_err.h	ucnv_err.h
	/*	/*
	**********************************************************************	**********************************************************************

	* Copyright (C) 1999-2007, International Business Machines	* Copyright (C) 1999-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	**********************************************************************	**********************************************************************
	*	*
	*	*
	* ucnv_err.h:	* ucnv_err.h:
	*/	*/

	/**	/**
	* \file	* \file
	* \brief C UConverter predefined error callbacks	* \brief C UConverter predefined error callbacks

	skipping to change at line 145	skipping to change at line 145
	#define UCNV_ESCAPE_XML_HEX "X"	#define UCNV_ESCAPE_XML_HEX "X"
	/**	/**
	* FROM_U_CALLBACK_ESCAPE context option to escape the code unit according to Unicode (U+XXXXX)	* FROM_U_CALLBACK_ESCAPE context option to escape the code unit according to Unicode (U+XXXXX)
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	#define UCNV_ESCAPE_UNICODE "U"	#define UCNV_ESCAPE_UNICODE "U"

	/**	/**
	* FROM_U_CALLBACK_ESCAPE context option to escape the code unit according to CSS2 conventions (\\HH..H<space>, that is,	* FROM_U_CALLBACK_ESCAPE context option to escape the code unit according to CSS2 conventions (\\HH..H<space>, that is,
	* a backslash, 1..6 hex digits, and a space)	* a backslash, 1..6 hex digits, and a space)

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	#define UCNV_ESCAPE_CSS2 "S"	#define UCNV_ESCAPE_CSS2 "S"

	/**	/**
	* The process condition code to be used with the callbacks.	* The process condition code to be used with the callbacks.
	* Codes which are greater than UCNV_IRREGULAR should be	* Codes which are greater than UCNV_IRREGULAR should be
	* passed on to any chained callbacks.	* passed on to any chained callbacks.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	typedef enum {	typedef enum {

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	ucol.h	ucol.h

	skipping to change at line 521	skipping to change at line 521
	ucol_getDisplayName( const char *objLoc,	ucol_getDisplayName( const char *objLoc,
	const char *dispLoc,	const char *dispLoc,
	UChar *result,	UChar *result,
	int32_t resultLength,	int32_t resultLength,
	UErrorCode *status);	UErrorCode *status);

	/**	/**
	* Get a locale for which collation rules are available.	* Get a locale for which collation rules are available.
	* A UCollator in a locale returned by this function will perform the corre ct	* A UCollator in a locale returned by this function will perform the corre ct
	* collation for the locale.	* collation for the locale.

	* @param index The index of the desired locale.	* @param localeIndex The index of the desired locale.
	* @return A locale for which collation rules are available, or 0 if none.	* @return A locale for which collation rules are available, or 0 if none.
	* @see ucol_countAvailable	* @see ucol_countAvailable
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE const char* U_EXPORT2	U_STABLE const char* U_EXPORT2

	ucol_getAvailable(int32_t index);	ucol_getAvailable(int32_t localeIndex);

	/**	/**
	* Determine how many locales have collation rules available.	* Determine how many locales have collation rules available.
	* This function is most useful as determining the loop ending condition fo r	* This function is most useful as determining the loop ending condition fo r
	* calls to {@link #ucol_getAvailable }.	* calls to {@link #ucol_getAvailable }.
	* @return The number of locales for which collation rules are available.	* @return The number of locales for which collation rules are available.
	* @see ucol_getAvailable	* @see ucol_getAvailable
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE int32_t U_EXPORT2	U_STABLE int32_t U_EXPORT2

	skipping to change at line 591	skipping to change at line 591
	* order that would make a difference. These are all and only those values where	* order that would make a difference. These are all and only those values where
	* the open (creation) of the service with the locale formed from the input locale	* the open (creation) of the service with the locale formed from the input locale
	* plus input keyword and that value has different behavior than creation w ith the	* plus input keyword and that value has different behavior than creation w ith the
	* input locale alone.	* input locale alone.
	* @param key one of the keys supported by this service. For now , only	* @param key one of the keys supported by this service. For now , only
	* "collation" is supported.	* "collation" is supported.
	* @param locale the locale	* @param locale the locale
	* @param commonlyUsed if set to true it will return only commonly used va lues	* @param commonlyUsed if set to true it will return only commonly used va lues
	* with the given locale in preferred order. Otherwis e,	* with the given locale in preferred order. Otherwis e,
	* it will return all the available values for the loc ale.	* it will return all the available values for the loc ale.

		* @param status error status
	* @return a string enumeration over keyword values for the given key and t he locale.	* @return a string enumeration over keyword values for the given key and t he locale.
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	U_DRAFT UEnumeration* U_EXPORT2	U_DRAFT UEnumeration* U_EXPORT2
	ucol_getKeywordValuesForLocale(const char* key,	ucol_getKeywordValuesForLocale(const char* key,
	const char* locale,	const char* locale,
	UBool commonlyUsed,	UBool commonlyUsed,
	UErrorCode* status);	UErrorCode* status);

	/**	/**

End of changes. 3 change blocks.
	2 lines changed or deleted	3 lines changed or added

	uconfig.h	uconfig.h
	/*	/*
	**********************************************************************	**********************************************************************

	* Copyright (C) 2002-2008, International Business Machines	* Copyright (C) 2002-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	**********************************************************************	**********************************************************************
	* file name: uconfig.h	* file name: uconfig.h
	* encoding: US-ASCII	* encoding: US-ASCII
	* tab size: 8 (not used)	* tab size: 8 (not used)
	* indentation:4	* indentation:4
	*	*
	* created on: 2002sep19	* created on: 2002sep19
	* created by: Markus W. Scherer	* created by: Markus W. Scherer
	*/	*/

	skipping to change at line 106	skipping to change at line 106
	*/	*/
	#ifndef UCONFIG_NO_FILE_IO	#ifndef UCONFIG_NO_FILE_IO
	# define UCONFIG_NO_FILE_IO 0	# define UCONFIG_NO_FILE_IO 0
	#endif	#endif

	/**	/**
	* \def UCONFIG_NO_CONVERSION	* \def UCONFIG_NO_CONVERSION
	* ICU will not completely build with this switch turned on.	* ICU will not completely build with this switch turned on.
	* This switch turns off all converters.	* This switch turns off all converters.
	*	*

		* You may want to use this together with U_CHARSET_IS_UTF8 defined to 1
		* in utypes.h if char* strings in your environment are always in UTF-8.
		*
	* @stable ICU 3.2	* @stable ICU 3.2

		* @see U_CHARSET_IS_UTF8
	*/	*/
	#ifndef UCONFIG_NO_CONVERSION	#ifndef UCONFIG_NO_CONVERSION
	# define UCONFIG_NO_CONVERSION 0	# define UCONFIG_NO_CONVERSION 0
	#endif	#endif

	#if UCONFIG_NO_CONVERSION	#if UCONFIG_NO_CONVERSION
	# define UCONFIG_NO_LEGACY_CONVERSION 1	# define UCONFIG_NO_LEGACY_CONVERSION 1
	#endif	#endif

	/**	/**

End of changes. 3 change blocks.
	1 lines changed or deleted	5 lines changed or added

	ucurr.h	ucurr.h

	skipping to change at line 258	skipping to change at line 258
	* given locale and date.	* given locale and date.
	* @param locale the locale for which to retrieve the	* @param locale the locale for which to retrieve the
	* currency count.	* currency count.
	* @param date the date for which to retrieve the	* @param date the date for which to retrieve the
	* currency count for the given locale.	* currency count for the given locale.
	* @param ec error code	* @param ec error code
	* @return the number of currency codes for the	* @return the number of currency codes for the
	* given locale and date. If 0, currency	* given locale and date. If 0, currency
	* codes couldn't be found for the input	* codes couldn't be found for the input
	* values are invalid.	* values are invalid.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	U_DRAFT int32_t U_EXPORT2	U_DRAFT int32_t U_EXPORT2
	ucurr_countCurrencies(const char* locale,	ucurr_countCurrencies(const char* locale,
	UDate date,	UDate date,
	UErrorCode* ec);	UErrorCode* ec);

	/**	/**
	* Finds a currency code for the given locale and date	* Finds a currency code for the given locale and date
	* @param locale the locale for which to retrieve a currency code.	* @param locale the locale for which to retrieve a currency code.
	* Currency can be specified by the "currency" keyword	* Currency can be specified by the "currency" keyword

	skipping to change at line 282	skipping to change at line 282
	* @param index the index within the available list of currency codes	* @param index the index within the available list of currency codes
	* for the given locale on the given date.	* for the given locale on the given date.
	* @param buff fill in buffer. Can be NULL for preflighting.	* @param buff fill in buffer. Can be NULL for preflighting.
	* @param buffCapacity capacity of the fill in buffer. Can be 0 for	* @param buffCapacity capacity of the fill in buffer. Can be 0 for
	* preflighting. If it is non-zero, the buff parameter	* preflighting. If it is non-zero, the buff parameter
	* must not be NULL.	* must not be NULL.
	* @param ec error code	* @param ec error code
	* @return length of the currency string. It should always be 3.	* @return length of the currency string. It should always be 3.
	* If 0, currency couldn't be found or the input values are	* If 0, currency couldn't be found or the input values are
	* invalid.	* invalid.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	U_DRAFT int32_t U_EXPORT2	U_DRAFT int32_t U_EXPORT2
	ucurr_forLocaleAndDate(const char* locale,	ucurr_forLocaleAndDate(const char* locale,
	UDate date,	UDate date,
	int32_t index,	int32_t index,
	UChar* buff,	UChar* buff,
	int32_t buffCapacity,	int32_t buffCapacity,
	UErrorCode* ec);	UErrorCode* ec);

	/**	/**

	skipping to change at line 304	skipping to change at line 304
	* order that would make a difference. These are all and only those values where	* order that would make a difference. These are all and only those values where
	* the open (creation) of the service with the locale formed from the input locale	* the open (creation) of the service with the locale formed from the input locale
	* plus input keyword and that value has different behavior than creation w ith the	* plus input keyword and that value has different behavior than creation w ith the
	* input locale alone.	* input locale alone.
	* @param key one of the keys supported by this service. For now , only	* @param key one of the keys supported by this service. For now , only
	* "currency" is supported.	* "currency" is supported.
	* @param locale the locale	* @param locale the locale
	* @param commonlyUsed if set to true it will return only commonly used va lues	* @param commonlyUsed if set to true it will return only commonly used va lues
	* with the given locale in preferred order. Otherwis e,	* with the given locale in preferred order. Otherwis e,
	* it will return all the available values for the loc ale.	* it will return all the available values for the loc ale.

		* @param status error status
	* @return a string enumeration over keyword values for the given key and t he locale.	* @return a string enumeration over keyword values for the given key and t he locale.
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	U_DRAFT UEnumeration* U_EXPORT2	U_DRAFT UEnumeration* U_EXPORT2
	ucurr_getKeywordValuesForLocale(const char* key,	ucurr_getKeywordValuesForLocale(const char* key,
	const char* locale,	const char* locale,
	UBool commonlyUsed,	UBool commonlyUsed,
	UErrorCode* status);	UErrorCode* status);

	#endif /* #if !UCONFIG_NO_FORMATTING */	#endif /* #if !UCONFIG_NO_FORMATTING */

End of changes. 3 change blocks.
	2 lines changed or deleted	3 lines changed or added

	udat.h	udat.h

	skipping to change at line 201	skipping to change at line 201
	* important, such as MMM, MMMM, and MMMMM; EEE and EEEE,	* important, such as MMM, MMMM, and MMMMM; EEE and EEEE,
	* and the field's pattern letter length is honored.	* and the field's pattern letter length is honored.
	*	*
	* For the digit calendar fields, such as M or MM, d or dd, yy or yyyy,	* For the digit calendar fields, such as M or MM, d or dd, yy or yyyy,
	* the field pattern length is ignored and the best match, which is defi ned	* the field pattern length is ignored and the best match, which is defi ned
	* in date time patterns, will be returned without honor the field patte rn	* in date time patterns, will be returned without honor the field patte rn
	* letter length in skeleton.	* letter length in skeleton.
	* </li>	* </li>
	* </ol>	* </ol>
	*	*

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/

	#define UDAT_MINUTE_SECOND "ms"	#define UDAT_MINUTE_SECOND "ms"
	#define UDAT_HOUR24_MINUTE "Hm"	#define UDAT_HOUR24_MINUTE "Hm"
	#define UDAT_HOUR24_MINUTE_SECOND "Hms"	#define UDAT_HOUR24_MINUTE_SECOND "Hms"
	#define UDAT_HOUR_MINUTE_SECOND "hms"	#define UDAT_HOUR_MINUTE_SECOND "hms"
	#define UDAT_STANDALONE_MONTH "LLLL"	#define UDAT_STANDALONE_MONTH "LLLL"
	#define UDAT_ABBR_STANDALONE_MONTH "LLL"	#define UDAT_ABBR_STANDALONE_MONTH "LLL"
	#define UDAT_YEAR_QUARTER "yQQQ"	#define UDAT_YEAR_QUARTER "yQQQ"
	#define UDAT_YEAR_ABBR_QUARTER "yQ"	#define UDAT_YEAR_ABBR_QUARTER "yQ"

	skipping to change at line 692	skipping to change at line 692
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE void U_EXPORT2	U_STABLE void U_EXPORT2
	udat_setNumberFormat( UDateFormat* fmt,	udat_setNumberFormat( UDateFormat* fmt,
	const UNumberFormat* numberFormatToSet);	const UNumberFormat* numberFormatToSet);

	/**	/**
	* Get a locale for which date/time formatting patterns are available.	* Get a locale for which date/time formatting patterns are available.
	* A UDateFormat in a locale returned by this function will perform the corr ect	* A UDateFormat in a locale returned by this function will perform the corr ect
	* formatting and parsing for the locale.	* formatting and parsing for the locale.

	* @param index The index of the desired locale.	* @param localeIndex The index of the desired locale.
	* @return A locale for which date/time formatting patterns are available, o r 0 if none.	* @return A locale for which date/time formatting patterns are available, o r 0 if none.
	* @see udat_countAvailable	* @see udat_countAvailable
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE const char* U_EXPORT2	U_STABLE const char* U_EXPORT2

	udat_getAvailable(int32_t index);	udat_getAvailable(int32_t localeIndex);

	/**	/**
	* Determine how many locales have date/time formatting patterns available.	* Determine how many locales have date/time formatting patterns available.
	* This function is most useful as determining the loop ending condition for	* This function is most useful as determining the loop ending condition for
	* calls to {@link #udat_getAvailable }.	* calls to {@link #udat_getAvailable }.
	* @return The number of locales for which date/time formatting patterns are available.	* @return The number of locales for which date/time formatting patterns are available.
	* @see udat_getAvailable	* @see udat_getAvailable
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE int32_t U_EXPORT2	U_STABLE int32_t U_EXPORT2

	skipping to change at line 832	skipping to change at line 832
	*/	*/
	typedef struct UDateFormatSymbols UDateFormatSymbols;	typedef struct UDateFormatSymbols UDateFormatSymbols;

	/**	/**
	* Get the symbols associated with an UDateFormat.	* Get the symbols associated with an UDateFormat.
	* The symbols are what a UDateFormat uses to represent locale-specific data ,	* The symbols are what a UDateFormat uses to represent locale-specific data ,
	* for example month or day names.	* for example month or day names.
	* @param fmt The formatter to query.	* @param fmt The formatter to query.
	* @param type The type of symbols to get. One of UDAT_ERAS, UDAT_MONTHS, U DAT_SHORT_MONTHS,	* @param type The type of symbols to get. One of UDAT_ERAS, UDAT_MONTHS, U DAT_SHORT_MONTHS,
	* UDAT_WEEKDAYS, UDAT_SHORT_WEEKDAYS, UDAT_AM_PMS, or UDAT_LOCALIZED_CHARS	* UDAT_WEEKDAYS, UDAT_SHORT_WEEKDAYS, UDAT_AM_PMS, or UDAT_LOCALIZED_CHARS

	* @param index The desired symbol of type type.	* @param symbolIndex The desired symbol of type type.
	* @param result A pointer to a buffer to receive the pattern.	* @param result A pointer to a buffer to receive the pattern.
	* @param resultLength The maximum size of result.	* @param resultLength The maximum size of result.
	* @param status A pointer to an UErrorCode to receive any errors	* @param status A pointer to an UErrorCode to receive any errors
	* @return The total buffer size needed; if greater than resultLength, the o utput was truncated.	* @return The total buffer size needed; if greater than resultLength, the o utput was truncated.
	* @see udat_countSymbols	* @see udat_countSymbols
	* @see udat_setSymbols	* @see udat_setSymbols
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE int32_t U_EXPORT2	U_STABLE int32_t U_EXPORT2
	udat_getSymbols(const UDateFormat *fmt,	udat_getSymbols(const UDateFormat *fmt,
	UDateFormatSymbolType type,	UDateFormatSymbolType type,

	int32_t index,	int32_t symbolIndex,
	UChar *result,	UChar *result,
	int32_t resultLength,	int32_t resultLength,
	UErrorCode *status);	UErrorCode *status);

	/**	/**
	* Count the number of particular symbols for an UDateFormat.	* Count the number of particular symbols for an UDateFormat.
	* This function is most useful as for detemining the loop termination condi tion	* This function is most useful as for detemining the loop termination condi tion
	* for calls to {@link #udat_getSymbols }.	* for calls to {@link #udat_getSymbols }.
	* @param fmt The formatter to query.	* @param fmt The formatter to query.
	* @param type The type of symbols to count. One of UDAT_ERAS, UDAT_MONTHS, UDAT_SHORT_MONTHS,	* @param type The type of symbols to count. One of UDAT_ERAS, UDAT_MONTHS, UDAT_SHORT_MONTHS,

	skipping to change at line 872	skipping to change at line 872
	udat_countSymbols( const UDateFormat *fmt,	udat_countSymbols( const UDateFormat *fmt,
	UDateFormatSymbolType type);	UDateFormatSymbolType type);

	/**	/**
	* Set the symbols associated with an UDateFormat.	* Set the symbols associated with an UDateFormat.
	* The symbols are what a UDateFormat uses to represent locale-specific data ,	* The symbols are what a UDateFormat uses to represent locale-specific data ,
	* for example month or day names.	* for example month or day names.
	* @param format The formatter to set	* @param format The formatter to set
	* @param type The type of symbols to set. One of UDAT_ERAS, UDAT_MONTHS, U DAT_SHORT_MONTHS,	* @param type The type of symbols to set. One of UDAT_ERAS, UDAT_MONTHS, U DAT_SHORT_MONTHS,
	* UDAT_WEEKDAYS, UDAT_SHORT_WEEKDAYS, UDAT_AM_PMS, or UDAT_LOCALIZED_CHARS	* UDAT_WEEKDAYS, UDAT_SHORT_WEEKDAYS, UDAT_AM_PMS, or UDAT_LOCALIZED_CHARS

	* @param index The index of the symbol to set of type type.	* @param symbolIndex The index of the symbol to set of type type.
	* @param value The new value	* @param value The new value
	* @param valueLength The length of value, or -1 if null-terminated	* @param valueLength The length of value, or -1 if null-terminated
	* @param status A pointer to an UErrorCode to receive any errors	* @param status A pointer to an UErrorCode to receive any errors
	* @see udat_getSymbols	* @see udat_getSymbols
	* @see udat_countSymbols	* @see udat_countSymbols
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE void U_EXPORT2	U_STABLE void U_EXPORT2
	udat_setSymbols( UDateFormat *format,	udat_setSymbols( UDateFormat *format,
	UDateFormatSymbolType type,	UDateFormatSymbolType type,

	int32_t index,	int32_t symbolIndex,
	UChar *value,	UChar *value,
	int32_t valueLength,	int32_t valueLength,
	UErrorCode *status);	UErrorCode *status);

	/**	/**
	* Get the locale for this date format object.	* Get the locale for this date format object.
	* You can choose between valid and actual locale.	* You can choose between valid and actual locale.
	* @param fmt The formatter to get the locale from	* @param fmt The formatter to get the locale from
	* @param type type of the locale we're looking for (valid or actual)	* @param type type of the locale we're looking for (valid or actual)
	* @param status error code for the operation	* @param status error code for the operation
	* @return the locale name	* @return the locale name
	* @stable ICU 2.8	* @stable ICU 2.8
	*/	*/
	U_STABLE const char* U_EXPORT2	U_STABLE const char* U_EXPORT2
	udat_getLocaleByType(const UDateFormat *fmt,	udat_getLocaleByType(const UDateFormat *fmt,
	ULocDataLocaleType type,	ULocDataLocaleType type,
	UErrorCode* status);	UErrorCode* status);


		/**
		* Extract the date pattern from a UDateFormat set for relative date formatt
		ing.
		* The pattern will follow the pattern syntax rules.
		* @param fmt The formatter to query.
		* @param result A pointer to a buffer to receive the pattern.
		* @param resultLength The maximum size of result.
		* @param status A pointer to a UErrorCode to receive any errors
		* @return The total buffer size needed; if greater than resultLength, the o
		utput was truncated.
		* @see udat_applyPatternRelative
		* @internal ICU 4.2 technology preview
		*/
		U_INTERNAL int32_t U_EXPORT2
		udat_toPatternRelativeDate(const UDateFormat *fmt,
		UChar *result,
		int32_t resultLength,
		UErrorCode *status);

		/**
		* Extract the time pattern from a UDateFormat set for relative date formatt
		ing.
		* The pattern will follow the pattern syntax rules.
		* @param fmt The formatter to query.
		* @param result A pointer to a buffer to receive the pattern.
		* @param resultLength The maximum size of result.
		* @param status A pointer to a UErrorCode to receive any errors
		* @return The total buffer size needed; if greater than resultLength, the o
		utput was truncated.
		* @see udat_applyPatternRelative
		* @internal ICU 4.2 technology preview
		*/
		U_INTERNAL int32_t U_EXPORT2
		udat_toPatternRelativeTime(const UDateFormat *fmt,
		UChar *result,
		int32_t resultLength,
		UErrorCode *status);

		/**
		* Set the date & time patterns used by a UDateFormat set for relative date
		formatting.
		* The patterns should follow the pattern syntax rules.
		* @param format The formatter to set.
		* @param datePattern The new date pattern
		* @param datePatternLength The length of datePattern, or -1 if null-termina
		ted.
		* @param timePattern The new time pattern
		* @param timePatternLength The length of timePattern, or -1 if null-termina
		ted.
		* @param status A pointer to a UErrorCode to receive any errors
		* @see udat_toPatternRelativeDate, udat_toPatternRelativeTime
		* @internal ICU 4.2 technology preview
		*/
		U_INTERNAL void U_EXPORT2
		udat_applyPatternRelative(UDateFormat *format,
		const UChar *datePattern,
		int32_t datePatternLength,
		const UChar *timePattern,
		int32_t timePatternLength,
		UErrorCode *status);

	#endif /* #if !UCONFIG_NO_FORMATTING */	#endif /* #if !UCONFIG_NO_FORMATTING */

	#endif	#endif

End of changes. 8 change blocks.
	7 lines changed or deleted	68 lines changed or added

	udatpg.h	udatpg.h
	/*	/*
	************************************************************************* **	************************************************************************* **
	*	*

	* Copyright (C) 2007-2008, International Business Machines	* Copyright (C) 2007-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	*	*
	************************************************************************* **	************************************************************************* **
	* file name: udatpg.h	* file name: udatpg.h
	* encoding: US-ASCII	* encoding: US-ASCII
	* tab size: 8 (not used)	* tab size: 8 (not used)
	* indentation:4	* indentation:4
	*	*
	* created on: 2007jul30	* created on: 2007jul30
	* created by: Markus W. Scherer	* created by: Markus W. Scherer

	skipping to change at line 46	skipping to change at line 46
	* fields in a pattern, in order, since we have that internally.	* fields in a pattern, in order, since we have that internally.
	* That would be useful for getting the UI order of field elements.</i>	* That would be useful for getting the UI order of field elements.</i>
	*/	*/

	/**	/**
	* Opaque type for a date/time pattern generator object.	* Opaque type for a date/time pattern generator object.
	* @stable ICU 3.8	* @stable ICU 3.8
	*/	*/
	typedef void *UDateTimePatternGenerator;	typedef void *UDateTimePatternGenerator;


	#ifndef U_HIDE_DRAFT_API

	/**	/**
	* Field number constants for udatpg_getAppendItemFormats() and similar fun ctions.	* Field number constants for udatpg_getAppendItemFormats() and similar fun ctions.
	* These constants are separate from UDateFormatField despite semantic over lap	* These constants are separate from UDateFormatField despite semantic over lap
	* because some fields are merged for the date/time pattern generator.	* because some fields are merged for the date/time pattern generator.
	* @stable ICU 3.8	* @stable ICU 3.8
	*/	*/
	typedef enum UDateTimePatternField {	typedef enum UDateTimePatternField {
	/** @stable ICU 3.8 */	/** @stable ICU 3.8 */
	UDATPG_ERA_FIELD,	UDATPG_ERA_FIELD,
	/** @stable ICU 3.8 */	/** @stable ICU 3.8 */

	skipping to change at line 106	skipping to change at line 104
	/** @stable ICU 3.8 */	/** @stable ICU 3.8 */
	UDATPG_NO_CONFLICT,	UDATPG_NO_CONFLICT,
	/** @stable ICU 3.8 */	/** @stable ICU 3.8 */
	UDATPG_BASE_CONFLICT,	UDATPG_BASE_CONFLICT,
	/** @stable ICU 3.8 */	/** @stable ICU 3.8 */
	UDATPG_CONFLICT,	UDATPG_CONFLICT,
	/** @stable ICU 3.8 */	/** @stable ICU 3.8 */
	UDATPG_CONFLICT_COUNT	UDATPG_CONFLICT_COUNT
	} UDateTimePatternConflict;	} UDateTimePatternConflict;


	#endif

	/**	/**
	* Open a generator according to a given locale.	* Open a generator according to a given locale.
	* @param locale	* @param locale
	* @param pErrorCode a pointer to the UErrorCode which must not indicate a	* @param pErrorCode a pointer to the UErrorCode which must not indicate a
	* failure before the function call.	* failure before the function call.
	* @return a pointer to UDateTimePatternGenerator.	* @return a pointer to UDateTimePatternGenerator.
	* @stable ICU 3.8	* @stable ICU 3.8
	*/	*/
	U_DRAFT UDateTimePatternGenerator * U_EXPORT2	U_DRAFT UDateTimePatternGenerator * U_EXPORT2
	udatpg_open(const char locale, UErrorCode pErrorCode);	udatpg_open(const char locale, UErrorCode pErrorCode);

End of changes. 3 change blocks.
	5 lines changed or deleted	1 lines changed or added

	udeprctd.h	udeprctd.h

	skipping to change at line 37	skipping to change at line 37
	# define ucol_getContractions ucol_getContractions_DEPRECATED_API_DO _NOT_USE	# define ucol_getContractions ucol_getContractions_DEPRECATED_API_DO _NOT_USE
	# define ucol_getLocale ucol_getLocale_DEPRECATED_API_DO_NOT_USE	# define ucol_getLocale ucol_getLocale_DEPRECATED_API_DO_NOT_USE
	# define ures_countArrayItems ures_countArrayItems_DEPRECATED_API_DO _NOT_USE	# define ures_countArrayItems ures_countArrayItems_DEPRECATED_API_DO _NOT_USE
	# define ures_getLocale ures_getLocale_DEPRECATED_API_DO_NOT_USE	# define ures_getLocale ures_getLocale_DEPRECATED_API_DO_NOT_USE
	# define ures_getVersionNumber ures_getVersionNumber_DEPRECATED_API_ DO_NOT_USE	# define ures_getVersionNumber ures_getVersionNumber_DEPRECATED_API_ DO_NOT_USE
	# define utrans_getAvailableID utrans_getAvailableID_DEPRECATED_API_ DO_NOT_USE	# define utrans_getAvailableID utrans_getAvailableID_DEPRECATED_API_ DO_NOT_USE
	# define utrans_getID utrans_getID_DEPRECATED_API_DO_NOT_USE	# define utrans_getID utrans_getID_DEPRECATED_API_DO_NOT_USE
	# define utrans_open utrans_open_DEPRECATED_API_DO_NOT_USE	# define utrans_open utrans_open_DEPRECATED_API_DO_NOT_USE
	# define utrans_unregister utrans_unregister_DEPRECATED_API_DO_NOT_U SE	# define utrans_unregister utrans_unregister_DEPRECATED_API_DO_NOT_U SE
	# else	# else

	# define ucol_getContractions_4_1.2 ucol_getContractions_DEPRECATED_	# define ucol_getContractions_4_2 ucol_getContractions_DEPRECATED_AP
	API_DO_NOT_USE	I_DO_NOT_USE
	# define ucol_getLocale_4_1.2 ucol_getLocale_DEPRECATED_API_DO_NOT_U	# define ucol_getLocale_4_2 ucol_getLocale_DEPRECATED_API_DO_NOT_USE
	SE	# define ures_countArrayItems_4_2 ures_countArrayItems_DEPRECATED_AP
	# define ures_countArrayItems_4_1.2 ures_countArrayItems_DEPRECATED_	I_DO_NOT_USE
	API_DO_NOT_USE	# define ures_getLocale_4_2 ures_getLocale_DEPRECATED_API_DO_NOT_USE
	# define ures_getLocale_4_1.2 ures_getLocale_DEPRECATED_API_DO_NOT_U	# define ures_getVersionNumber_4_2 ures_getVersionNumber_DEPRECATED_
	SE	API_DO_NOT_USE
	# define ures_getVersionNumber_4_1.2 ures_getVersionNumber_DEPRECATE	# define utrans_getAvailableID_4_2 utrans_getAvailableID_DEPRECATED_
	D_API_DO_NOT_USE	API_DO_NOT_USE
	# define utrans_getAvailableID_4_1.2 utrans_getAvailableID_DEPRECATE	# define utrans_getID_4_2 utrans_getID_DEPRECATED_API_DO_NOT_USE
	D_API_DO_NOT_USE	# define utrans_open_4_2 utrans_open_DEPRECATED_API_DO_NOT_USE
	# define utrans_getID_4_1.2 utrans_getID_DEPRECATED_API_DO_NOT_USE	# define utrans_unregister_4_2 utrans_unregister_DEPRECATED_API_DO_N
	# define utrans_open_4_1.2 utrans_open_DEPRECATED_API_DO_NOT_USE	OT_USE
	# define utrans_unregister_4_1.2 utrans_unregister_DEPRECATED_API_DO
	_NOT_USE
	# endif /* U_DISABLE_RENAMING */	# endif /* U_DISABLE_RENAMING */

	#endif /* U_HIDE_DEPRECATED_API */	#endif /* U_HIDE_DEPRECATED_API */
	#endif /* UDEPRCTD_H */	#endif /* UDEPRCTD_H */

End of changes. 1 change blocks.
	16 lines changed or deleted	14 lines changed or added

	udraft.h	udraft.h

	skipping to change at line 27	skipping to change at line 27
	* THIS FILE IS MACHINE-GENERATED, DON'T PLAY WITH IT IF YOU DON'T KNOW WHA T	* THIS FILE IS MACHINE-GENERATED, DON'T PLAY WITH IT IF YOU DON'T KNOW WHA T
	* YOU ARE DOING, OTHERWISE VERY BAD THINGS WILL HAPPEN!	* YOU ARE DOING, OTHERWISE VERY BAD THINGS WILL HAPPEN!
	*/	*/

	#ifndef UDRAFT_H	#ifndef UDRAFT_H
	#define UDRAFT_H	#define UDRAFT_H

	#ifdef U_HIDE_DRAFT_API	#ifdef U_HIDE_DRAFT_API

	# if U_DISABLE_RENAMING	# if U_DISABLE_RENAMING

	# define afkLanguageCode afkLanguageCode_DRAFT_API_DO_NOT_USE	# define u_compareVersions u_compareVersions_DRAFT_API_DO_NOT_USE
	# define armiScriptCode armiScriptCode_DRAFT_API_DO_NOT_USE	# define u_strFromUTF32WithSub u_strFromUTF32WithSub_DRAFT_API_DO_NO
	# define u_fclose u_fclose_DRAFT_API_DO_NOT_USE	T_USE
	# define u_feof u_feof_DRAFT_API_DO_NOT_USE	# define u_strToUTF32WithSub u_strToUTF32WithSub_DRAFT_API_DO_NOT_US
	# define u_fflush u_fflush_DRAFT_API_DO_NOT_USE	E
	# define u_fgetConverter u_fgetConverter_DRAFT_API_DO_NOT_USE	# define u_versionFromUString u_versionFromUString_DRAFT_API_DO_NOT_
	# define u_fgetc u_fgetc_DRAFT_API_DO_NOT_USE	USE
	# define u_fgetcodepage u_fgetcodepage_DRAFT_API_DO_NOT_USE	# define ucal_getKeywordValuesForLocale ucal_getKeywordValuesForLoca
	# define u_fgetcx u_fgetcx_DRAFT_API_DO_NOT_USE	le_DRAFT_API_DO_NOT_USE
	# define u_fgetfile u_fgetfile_DRAFT_API_DO_NOT_USE
	# define u_fgetlocale u_fgetlocale_DRAFT_API_DO_NOT_USE
	# define u_fgets u_fgets_DRAFT_API_DO_NOT_USE
	# define u_file_read u_file_read_DRAFT_API_DO_NOT_USE
	# define u_file_write u_file_write_DRAFT_API_DO_NOT_USE
	# define u_finit u_finit_DRAFT_API_DO_NOT_USE
	# define u_fopen u_fopen_DRAFT_API_DO_NOT_USE
	# define u_fprintf u_fprintf_DRAFT_API_DO_NOT_USE
	# define u_fprintf_u u_fprintf_u_DRAFT_API_DO_NOT_USE
	# define u_fputc u_fputc_DRAFT_API_DO_NOT_USE
	# define u_fputs u_fputs_DRAFT_API_DO_NOT_USE
	# define u_frewind u_frewind_DRAFT_API_DO_NOT_USE
	# define u_fscanf u_fscanf_DRAFT_API_DO_NOT_USE
	# define u_fscanf_u u_fscanf_u_DRAFT_API_DO_NOT_USE
	# define u_fsetcodepage u_fsetcodepage_DRAFT_API_DO_NOT_USE
	# define u_fsetlocale u_fsetlocale_DRAFT_API_DO_NOT_USE
	# define u_fsettransliterator u_fsettransliterator_DRAFT_API_DO_NOT_
	USE
	# define u_fstropen u_fstropen_DRAFT_API_DO_NOT_USE
	# define u_fungetc u_fungetc_DRAFT_API_DO_NOT_USE
	# define u_snprintf u_snprintf_DRAFT_API_DO_NOT_USE
	# define u_snprintf_u u_snprintf_u_DRAFT_API_DO_NOT_USE
	# define u_sprintf u_sprintf_DRAFT_API_DO_NOT_USE
	# define u_sprintf_u u_sprintf_u_DRAFT_API_DO_NOT_USE
	# define u_sscanf u_sscanf_DRAFT_API_DO_NOT_USE
	# define u_sscanf_u u_sscanf_u_DRAFT_API_DO_NOT_USE
	# define u_vfprintf u_vfprintf_DRAFT_API_DO_NOT_USE
	# define u_vfprintf_u u_vfprintf_u_DRAFT_API_DO_NOT_USE
	# define u_vfscanf u_vfscanf_DRAFT_API_DO_NOT_USE
	# define u_vfscanf_u u_vfscanf_u_DRAFT_API_DO_NOT_USE
	# define u_vsnprintf u_vsnprintf_DRAFT_API_DO_NOT_USE
	# define u_vsnprintf_u u_vsnprintf_u_DRAFT_API_DO_NOT_USE
	# define u_vsprintf u_vsprintf_DRAFT_API_DO_NOT_USE
	# define u_vsprintf_u u_vsprintf_u_DRAFT_API_DO_NOT_USE
	# define u_vsscanf u_vsscanf_DRAFT_API_DO_NOT_USE
	# define u_vsscanf_u u_vsscanf_u_DRAFT_API_DO_NOT_USE
	# define ucal_clone ucal_clone_DRAFT_API_DO_NOT_USE
	# define ucal_getCanonicalTimeZoneID ucal_getCanonicalTimeZoneID_DRA
	FT_API_DO_NOT_USE
	# define ucal_getType ucal_getType_DRAFT_API_DO_NOT_USE	# define ucal_getType ucal_getType_DRAFT_API_DO_NOT_USE
	# define ucnvsel_close ucnvsel_close_DRAFT_API_DO_NOT_USE	# define ucnvsel_close ucnvsel_close_DRAFT_API_DO_NOT_USE
	# define ucnvsel_open ucnvsel_open_DRAFT_API_DO_NOT_USE	# define ucnvsel_open ucnvsel_open_DRAFT_API_DO_NOT_USE
	# define ucnvsel_openFromSerialized ucnvsel_openFromSerialized_DRAFT _API_DO_NOT_USE	# define ucnvsel_openFromSerialized ucnvsel_openFromSerialized_DRAFT _API_DO_NOT_USE
	# define ucnvsel_selectForString ucnvsel_selectForString_DRAFT_API_D O_NOT_USE	# define ucnvsel_selectForString ucnvsel_selectForString_DRAFT_API_D O_NOT_USE
	# define ucnvsel_selectForUTF8 ucnvsel_selectForUTF8_DRAFT_API_DO_NO T_USE	# define ucnvsel_selectForUTF8 ucnvsel_selectForUTF8_DRAFT_API_DO_NO T_USE
	# define ucnvsel_serialize ucnvsel_serialize_DRAFT_API_DO_NOT_USE	# define ucnvsel_serialize ucnvsel_serialize_DRAFT_API_DO_NOT_USE

	# define ucurr_countCurrencies ucurr_countCurrencies_DRAFT_API_DO_NO	# define ucol_getKeywordValuesForLocale ucol_getKeywordValuesForLoca
	T_USE	le_DRAFT_API_DO_NOT_USE
	# define ucurr_forLocaleAndDate ucurr_forLocaleAndDate_DRAFT_API_DO_	# define ucurr_getKeywordValuesForLocale ucurr_getKeywordValuesForLo
	NOT_USE	cale_DRAFT_API_DO_NOT_USE
	# define uloc_addLikelySubtags uloc_addLikelySubtags_DRAFT_API_DO_NO	# define ucurr_getPluralName ucurr_getPluralName_DRAFT_API_DO_NOT_US
	T_USE	E
	# define uloc_getCharacterOrientation uloc_getCharacterOrientation_D	# define uloc_forLanguageTag uloc_forLanguageTag_DRAFT_API_DO_NOT_US
	RAFT_API_DO_NOT_USE	E
	# define uloc_getLineOrientation uloc_getLineOrientation_DRAFT_API_D	# define uloc_toLanguageTag uloc_toLanguageTag_DRAFT_API_DO_NOT_USE
	O_NOT_USE	# define ulocdata_getCLDRVersion ulocdata_getCLDRVersion_DRAFT_API_D
	# define uloc_minimizeSubtags uloc_minimizeSubtags_DRAFT_API_DO_NOT_	O_NOT_USE
	USE	# define ulocdata_getLocaleDisplayPattern ulocdata_getLocaleDisplayP
	# define uregex_getMatchCallback uregex_getMatchCallback_DRAFT_API_D	attern_DRAFT_API_DO_NOT_USE
	O_NOT_USE	# define ulocdata_getLocaleSeparator ulocdata_getLocaleSeparator_DRA
	# define uregex_getStackLimit uregex_getStackLimit_DRAFT_API_DO_NOT_	FT_API_DO_NOT_USE
	USE	# define uset_closeOver uset_closeOver_DRAFT_API_DO_NOT_USE
	# define uregex_getTimeLimit uregex_getTimeLimit_DRAFT_API_DO_NOT_US	# define uset_openEmpty uset_openEmpty_DRAFT_API_DO_NOT_USE
	E	# define uset_removeAllStrings uset_removeAllStrings_DRAFT_API_DO_NO
	# define uregex_hasAnchoringBounds uregex_hasAnchoringBounds_DRAFT_A	T_USE
	PI_DO_NOT_USE	# define uspoof_areConfusable uspoof_areConfusable_DRAFT_API_DO_NOT_
	# define uregex_hasTransparentBounds uregex_hasTransparentBounds_DRA	USE
	FT_API_DO_NOT_USE	# define uspoof_areConfusableUTF8 uspoof_areConfusableUTF8_DRAFT_API
	# define uregex_hitEnd uregex_hitEnd_DRAFT_API_DO_NOT_USE	_DO_NOT_USE
	# define uregex_regionEnd uregex_regionEnd_DRAFT_API_DO_NOT_USE	# define uspoof_check uspoof_check_DRAFT_API_DO_NOT_USE
	# define uregex_regionStart uregex_regionStart_DRAFT_API_DO_NOT_USE	# define uspoof_checkUTF8 uspoof_checkUTF8_DRAFT_API_DO_NOT_USE
	# define uregex_requireEnd uregex_requireEnd_DRAFT_API_DO_NOT_USE	# define uspoof_clone uspoof_clone_DRAFT_API_DO_NOT_USE
	# define uregex_setMatchCallback uregex_setMatchCallback_DRAFT_API_D	# define uspoof_close uspoof_close_DRAFT_API_DO_NOT_USE
	O_NOT_USE	# define uspoof_getAllowedChars uspoof_getAllowedChars_DRAFT_API_DO_
	# define uregex_setRegion uregex_setRegion_DRAFT_API_DO_NOT_USE	NOT_USE
	# define uregex_setStackLimit uregex_setStackLimit_DRAFT_API_DO_NOT_	# define uspoof_getAllowedLocales uspoof_getAllowedLocales_DRAFT_API
	USE	_DO_NOT_USE
	# define uregex_setTimeLimit uregex_setTimeLimit_DRAFT_API_DO_NOT_US	# define uspoof_getChecks uspoof_getChecks_DRAFT_API_DO_NOT_USE
	E	# define uspoof_getSkeleton uspoof_getSkeleton_DRAFT_API_DO_NOT_USE
	# define uregex_useAnchoringBounds uregex_useAnchoringBounds_DRAFT_A	# define uspoof_getSkeletonUTF8 uspoof_getSkeletonUTF8_DRAFT_API_DO_
	PI_DO_NOT_USE	NOT_USE
	# define uregex_useTransparentBounds uregex_useTransparentBounds_DRA	# define uspoof_open uspoof_open_DRAFT_API_DO_NOT_USE
	FT_API_DO_NOT_USE	# define uspoof_openFromSerialized uspoof_openFromSerialized_DRAFT_A
		PI_DO_NOT_USE
		# define uspoof_openFromSource uspoof_openFromSource_DRAFT_API_DO_NO
		T_USE
		# define uspoof_serialize uspoof_serialize_DRAFT_API_DO_NOT_USE
		# define uspoof_setAllowedChars uspoof_setAllowedChars_DRAFT_API_DO_
		NOT_USE
		# define uspoof_setAllowedLocales uspoof_setAllowedLocales_DRAFT_API
		_DO_NOT_USE
		# define uspoof_setChecks uspoof_setChecks_DRAFT_API_DO_NOT_USE
		# define usprep_openByType usprep_openByType_DRAFT_API_DO_NOT_USE
	# else	# else

	# define afkLanguageCode_4_1.2 afkLanguageCode_DRAFT_API_DO_NOT_USE	# define u_compareVersions_4_2 u_compareVersions_DRAFT_API_DO_NOT_US
	# define armiScriptCode_4_1.2 armiScriptCode_DRAFT_API_DO_NOT_USE	E
	# define u_fclose_4_1.2 u_fclose_DRAFT_API_DO_NOT_USE	# define u_strFromUTF32WithSub_4_2 u_strFromUTF32WithSub_DRAFT_API_D
	# define u_feof_4_1.2 u_feof_DRAFT_API_DO_NOT_USE	O_NOT_USE
	# define u_fflush_4_1.2 u_fflush_DRAFT_API_DO_NOT_USE	# define u_strToUTF32WithSub_4_2 u_strToUTF32WithSub_DRAFT_API_DO_NO
	# define u_fgetConverter_4_1.2 u_fgetConverter_DRAFT_API_DO_NOT_USE	T_USE
	# define u_fgetc_4_1.2 u_fgetc_DRAFT_API_DO_NOT_USE	# define u_versionFromUString_4_2 u_versionFromUString_DRAFT_API_DO_
	# define u_fgetcodepage_4_1.2 u_fgetcodepage_DRAFT_API_DO_NOT_USE	NOT_USE
	# define u_fgetcx_4_1.2 u_fgetcx_DRAFT_API_DO_NOT_USE	# define ucal_getKeywordValuesForLocale_4_2 ucal_getKeywordValuesFor
	# define u_fgetfile_4_1.2 u_fgetfile_DRAFT_API_DO_NOT_USE	Locale_DRAFT_API_DO_NOT_USE
	# define u_fgetlocale_4_1.2 u_fgetlocale_DRAFT_API_DO_NOT_USE	# define ucal_getType_4_2 ucal_getType_DRAFT_API_DO_NOT_USE
	# define u_fgets_4_1.2 u_fgets_DRAFT_API_DO_NOT_USE	# define ucnvsel_close_4_2 ucnvsel_close_DRAFT_API_DO_NOT_USE
	# define u_file_read_4_1.2 u_file_read_DRAFT_API_DO_NOT_USE	# define ucnvsel_openFromSerialized_4_2 ucnvsel_openFromSerialized_D
	# define u_file_write_4_1.2 u_file_write_DRAFT_API_DO_NOT_USE	RAFT_API_DO_NOT_USE
	# define u_finit_4_1.2 u_finit_DRAFT_API_DO_NOT_USE	# define ucnvsel_open_4_2 ucnvsel_open_DRAFT_API_DO_NOT_USE
	# define u_fopen_4_1.2 u_fopen_DRAFT_API_DO_NOT_USE	# define ucnvsel_selectForString_4_2 ucnvsel_selectForString_DRAFT_A
	# define u_fprintf_4_1.2 u_fprintf_DRAFT_API_DO_NOT_USE	PI_DO_NOT_USE
	# define u_fprintf_u_4_1.2 u_fprintf_u_DRAFT_API_DO_NOT_USE	# define ucnvsel_selectForUTF8_4_2 ucnvsel_selectForUTF8_DRAFT_API_D
	# define u_fputc_4_1.2 u_fputc_DRAFT_API_DO_NOT_USE	O_NOT_USE
	# define u_fputs_4_1.2 u_fputs_DRAFT_API_DO_NOT_USE	# define ucnvsel_serialize_4_2 ucnvsel_serialize_DRAFT_API_DO_NOT_US
	# define u_frewind_4_1.2 u_frewind_DRAFT_API_DO_NOT_USE	E
	# define u_fscanf_4_1.2 u_fscanf_DRAFT_API_DO_NOT_USE	# define ucol_getKeywordValuesForLocale_4_2 ucol_getKeywordValuesFor
	# define u_fscanf_u_4_1.2 u_fscanf_u_DRAFT_API_DO_NOT_USE	Locale_DRAFT_API_DO_NOT_USE
	# define u_fsetcodepage_4_1.2 u_fsetcodepage_DRAFT_API_DO_NOT_USE	# define ucurr_getKeywordValuesForLocale_4_2 ucurr_getKeywordValuesF
	# define u_fsetlocale_4_1.2 u_fsetlocale_DRAFT_API_DO_NOT_USE	orLocale_DRAFT_API_DO_NOT_USE
	# define u_fsettransliterator_4_1.2 u_fsettransliterator_DRAFT_API_D	# define ucurr_getPluralName_4_2 ucurr_getPluralName_DRAFT_API_DO_NO
	O_NOT_USE	T_USE
	# define u_fstropen_4_1.2 u_fstropen_DRAFT_API_DO_NOT_USE	# define uloc_forLanguageTag_4_2 uloc_forLanguageTag_DRAFT_API_DO_NO
	# define u_fungetc_4_1.2 u_fungetc_DRAFT_API_DO_NOT_USE	T_USE
	# define u_snprintf_4_1.2 u_snprintf_DRAFT_API_DO_NOT_USE	# define uloc_toLanguageTag_4_2 uloc_toLanguageTag_DRAFT_API_DO_NOT_
	# define u_snprintf_u_4_1.2 u_snprintf_u_DRAFT_API_DO_NOT_USE	USE
	# define u_sprintf_4_1.2 u_sprintf_DRAFT_API_DO_NOT_USE	# define ulocdata_getCLDRVersion_4_2 ulocdata_getCLDRVersion_DRAFT_A
	# define u_sprintf_u_4_1.2 u_sprintf_u_DRAFT_API_DO_NOT_USE	PI_DO_NOT_USE
	# define u_sscanf_4_1.2 u_sscanf_DRAFT_API_DO_NOT_USE	# define ulocdata_getLocaleDisplayPattern_4_2 ulocdata_getLocaleDisp
	# define u_sscanf_u_4_1.2 u_sscanf_u_DRAFT_API_DO_NOT_USE	layPattern_DRAFT_API_DO_NOT_USE
	# define u_vfprintf_4_1.2 u_vfprintf_DRAFT_API_DO_NOT_USE	# define ulocdata_getLocaleSeparator_4_2 ulocdata_getLocaleSeparator
	# define u_vfprintf_u_4_1.2 u_vfprintf_u_DRAFT_API_DO_NOT_USE	_DRAFT_API_DO_NOT_USE
	# define u_vfscanf_4_1.2 u_vfscanf_DRAFT_API_DO_NOT_USE	# define uset_closeOver_4_2 uset_closeOver_DRAFT_API_DO_NOT_USE
	# define u_vfscanf_u_4_1.2 u_vfscanf_u_DRAFT_API_DO_NOT_USE	# define uset_openEmpty_4_2 uset_openEmpty_DRAFT_API_DO_NOT_USE
	# define u_vsnprintf_4_1.2 u_vsnprintf_DRAFT_API_DO_NOT_USE	# define uset_removeAllStrings_4_2 uset_removeAllStrings_DRAFT_API_D
	# define u_vsnprintf_u_4_1.2 u_vsnprintf_u_DRAFT_API_DO_NOT_USE	O_NOT_USE
	# define u_vsprintf_4_1.2 u_vsprintf_DRAFT_API_DO_NOT_USE	# define uspoof_areConfusableUTF8_4_2 uspoof_areConfusableUTF8_DRAFT
	# define u_vsprintf_u_4_1.2 u_vsprintf_u_DRAFT_API_DO_NOT_USE	_API_DO_NOT_USE
	# define u_vsscanf_4_1.2 u_vsscanf_DRAFT_API_DO_NOT_USE	# define uspoof_areConfusable_4_2 uspoof_areConfusable_DRAFT_API_DO_
	# define u_vsscanf_u_4_1.2 u_vsscanf_u_DRAFT_API_DO_NOT_USE	NOT_USE
	# define ucal_clone_4_1.2 ucal_clone_DRAFT_API_DO_NOT_USE	# define uspoof_checkUTF8_4_2 uspoof_checkUTF8_DRAFT_API_DO_NOT_USE
	# define ucal_getCanonicalTimeZoneID_4_1.2 ucal_getCanonicalTimeZone	# define uspoof_check_4_2 uspoof_check_DRAFT_API_DO_NOT_USE
	ID_DRAFT_API_DO_NOT_USE	# define uspoof_clone_4_2 uspoof_clone_DRAFT_API_DO_NOT_USE
	# define ucal_getType_4_1.2 ucal_getType_DRAFT_API_DO_NOT_USE	# define uspoof_close_4_2 uspoof_close_DRAFT_API_DO_NOT_USE
	# define ucnvsel_close_4_1.2 ucnvsel_close_DRAFT_API_DO_NOT_USE	# define uspoof_getAllowedChars_4_2 uspoof_getAllowedChars_DRAFT_API
	# define ucnvsel_openFromSerialized_4_1.2 ucnvsel_openFromSerialized	_DO_NOT_USE
	_DRAFT_API_DO_NOT_USE	# define uspoof_getAllowedLocales_4_2 uspoof_getAllowedLocales_DRAFT
	# define ucnvsel_open_4_1.2 ucnvsel_open_DRAFT_API_DO_NOT_USE	_API_DO_NOT_USE
	# define ucnvsel_selectForString_4_1.2 ucnvsel_selectForString_DRAFT	# define uspoof_getChecks_4_2 uspoof_getChecks_DRAFT_API_DO_NOT_USE
	_API_DO_NOT_USE	# define uspoof_getSkeletonUTF8_4_2 uspoof_getSkeletonUTF8_DRAFT_API
	# define ucnvsel_selectForUTF8_4_1.2 ucnvsel_selectForUTF8_DRAFT_API	_DO_NOT_USE
	_DO_NOT_USE	# define uspoof_getSkeleton_4_2 uspoof_getSkeleton_DRAFT_API_DO_NOT_
	# define ucnvsel_serialize_4_1.2 ucnvsel_serialize_DRAFT_API_DO_NOT_	USE
	USE	# define uspoof_openFromSerialized_4_2 uspoof_openFromSerialized_DRA
	# define ucurr_countCurrencies_4_1.2 ucurr_countCurrencies_DRAFT_API	FT_API_DO_NOT_USE
	_DO_NOT_USE	# define uspoof_openFromSource_4_2 uspoof_openFromSource_DRAFT_API_D
	# define ucurr_forLocaleAndDate_4_1.2 ucurr_forLocaleAndDate_DRAFT_A	O_NOT_USE
	PI_DO_NOT_USE	# define uspoof_open_4_2 uspoof_open_DRAFT_API_DO_NOT_USE
	# define uloc_addLikelySubtags_4_1.2 uloc_addLikelySubtags_DRAFT_API	# define uspoof_serialize_4_2 uspoof_serialize_DRAFT_API_DO_NOT_USE
	_DO_NOT_USE	# define uspoof_setAllowedChars_4_2 uspoof_setAllowedChars_DRAFT_API
	# define uloc_getCharacterOrientation_4_1.2 uloc_getCharacterOrienta	_DO_NOT_USE
	tion_DRAFT_API_DO_NOT_USE	# define uspoof_setAllowedLocales_4_2 uspoof_setAllowedLocales_DRAFT
	# define uloc_getLineOrientation_4_1.2 uloc_getLineOrientation_DRAFT	_API_DO_NOT_USE
	_API_DO_NOT_USE	# define uspoof_setChecks_4_2 uspoof_setChecks_DRAFT_API_DO_NOT_USE
	# define uloc_minimizeSubtags_4_1.2 uloc_minimizeSubtags_DRAFT_API_D	# define usprep_openByType_4_2 usprep_openByType_DRAFT_API_DO_NOT_US
	O_NOT_USE	E
	# define uregex_getMatchCallback_4_1.2 uregex_getMatchCallback_DRAFT
	_API_DO_NOT_USE
	# define uregex_getStackLimit_4_1.2 uregex_getStackLimit_DRAFT_API_D
	O_NOT_USE
	# define uregex_getTimeLimit_4_1.2 uregex_getTimeLimit_DRAFT_API_DO_
	NOT_USE
	# define uregex_hasAnchoringBounds_4_1.2 uregex_hasAnchoringBounds_D
	RAFT_API_DO_NOT_USE
	# define uregex_hasTransparentBounds_4_1.2 uregex_hasTransparentBoun
	ds_DRAFT_API_DO_NOT_USE
	# define uregex_hitEnd_4_1.2 uregex_hitEnd_DRAFT_API_DO_NOT_USE
	# define uregex_regionEnd_4_1.2 uregex_regionEnd_DRAFT_API_DO_NOT_US
	E
	# define uregex_regionStart_4_1.2 uregex_regionStart_DRAFT_API_DO_NO
	T_USE
	# define uregex_requireEnd_4_1.2 uregex_requireEnd_DRAFT_API_DO_NOT_
	USE
	# define uregex_setMatchCallback_4_1.2 uregex_setMatchCallback_DRAFT
	_API_DO_NOT_USE
	# define uregex_setRegion_4_1.2 uregex_setRegion_DRAFT_API_DO_NOT_US
	E
	# define uregex_setStackLimit_4_1.2 uregex_setStackLimit_DRAFT_API_D
	O_NOT_USE
	# define uregex_setTimeLimit_4_1.2 uregex_setTimeLimit_DRAFT_API_DO_
	NOT_USE
	# define uregex_useAnchoringBounds_4_1.2 uregex_useAnchoringBounds_D
	RAFT_API_DO_NOT_USE
	# define uregex_useTransparentBounds_4_1.2 uregex_useTransparentBoun
	ds_DRAFT_API_DO_NOT_USE
	# endif /* U_DISABLE_RENAMING */	# endif /* U_DISABLE_RENAMING */

	#endif /* U_HIDE_DRAFT_API */	#endif /* U_HIDE_DRAFT_API */
	#endif /* UDRAFT_H */	#endif /* UDRAFT_H */

End of changes. 3 change blocks.
	185 lines changed or deleted	127 lines changed or added

	uenum.h	uenum.h
	/*	/*
	************************************************************************* **	************************************************************************* **
	*	*

	* Copyright (C) 2002-2005, International Business Machines	* Copyright (C) 2002-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	*	*
	************************************************************************* **	************************************************************************* **
	* file name: uenum.h	* file name: uenum.h
	* encoding: US-ASCII	* encoding: US-ASCII
	* tab size: 8 (not used)	* tab size: 8 (not used)
	* indentation:2	* indentation:2
	*	*
	* created on: 2002jul08	* created on: 2002jul08
	* created by: Vladimir Weinstein	* created by: Vladimir Weinstein
	*/	*/

	#ifndef __UENUM_H	#ifndef __UENUM_H
	#define __UENUM_H	#define __UENUM_H

	#include "unicode/utypes.h"	#include "unicode/utypes.h"


		#ifdef XP_CPLUSPLUS
		#include "unicode/strenum.h"
		#endif

	/**	/**
	* \file	* \file
	* \brief C API: String Enumeration	* \brief C API: String Enumeration
	*/	*/

	/**	/**
	* An enumeration object.	* An enumeration object.
	* For usage in C programs.	* For usage in C programs.
	* @stable ICU 2.2	* @stable ICU 2.2
	*/	*/

	skipping to change at line 134	skipping to change at line 138
	* re-establishes sync with the service and rewinds the iterator	* re-establishes sync with the service and rewinds the iterator
	* to start at the first element.	* to start at the first element.
	* @param en the iterator object	* @param en the iterator object
	* @param status the error code, set to U_ENUM_OUT_OF_SYNC_ERROR if	* @param status the error code, set to U_ENUM_OUT_OF_SYNC_ERROR if
	* the iterator is out of sync with its service.	* the iterator is out of sync with its service.
	* @stable ICU 2.2	* @stable ICU 2.2
	*/	*/
	U_STABLE void U_EXPORT2	U_STABLE void U_EXPORT2
	uenum_reset(UEnumeration* en, UErrorCode* status);	uenum_reset(UEnumeration* en, UErrorCode* status);


		#ifdef XP_CPLUSPLUS

		/**
		* Given a StringEnumeration, wrap it in a UEnumeration. The
		* StringEnumeration is adopted; after this call, the caller must not
		* delete it (regardless of error status).
		* @param adopted the C++ StringEnumeration to be wrapped in a UEnumeration
		.
		* @param ec the error code.
		* @return a UEnumeration wrapping the adopted StringEnumeration.
		* @draft ICU 4.2
		*/
		U_CAPI UEnumeration* U_EXPORT2
		uenum_openFromStringEnumeration(U_NAMESPACE_QUALIFIER StringEnumeration* ad
		opted, UErrorCode* ec);

		#endif

	#endif	#endif

End of changes. 3 change blocks.
	1 lines changed or deleted	23 lines changed or added

	uintrnal.h	uintrnal.h

	skipping to change at line 28	skipping to change at line 28
	* YOU ARE DOING, OTHERWISE VERY BAD THINGS WILL HAPPEN!	* YOU ARE DOING, OTHERWISE VERY BAD THINGS WILL HAPPEN!
	*/	*/

	#ifndef UINTRNAL_H	#ifndef UINTRNAL_H
	#define UINTRNAL_H	#define UINTRNAL_H

	#ifdef U_HIDE_INTERNAL_API	#ifdef U_HIDE_INTERNAL_API

	# if U_DISABLE_RENAMING	# if U_DISABLE_RENAMING
	# define RegexPatternDump RegexPatternDump_INTERNAL_API_DO_NOT_USE	# define RegexPatternDump RegexPatternDump_INTERNAL_API_DO_NOT_USE

		# define bms.h bms.h_INTERNAL_API_DO_NOT_USE
		# define bms_empty bms_empty_INTERNAL_API_DO_NOT_USE
		# define bms_getData bms_getData_INTERNAL_API_DO_NOT_USE
		# define bms_open bms_open_INTERNAL_API_DO_NOT_USE
		# define bms_search bms_search_INTERNAL_API_DO_NOT_USE
		# define bms_setTargetString bms_setTargetString_INTERNAL_API_DO_NOT
		_USE
		# define bmsearch.h bmsearch.h_INTERNAL_API_DO_NOT_USE
		# define colldata.h colldata.h_INTERNAL_API_DO_NOT_USE
		# define decimfmtAffixPatternValueComparator decimfmtAffixPatternVal
		ueComparator_INTERNAL_API_DO_NOT_USE
		# define decimfmtAffixValueComparator decimfmtAffixValueComparator_I
		NTERNAL_API_DO_NOT_USE
		# define dtitvinfHashTableValueComparator dtitvinfHashTableValueComp
		arator_INTERNAL_API_DO_NOT_USE
	# define pl_addFontRun pl_addFontRun_INTERNAL_API_DO_NOT_USE	# define pl_addFontRun pl_addFontRun_INTERNAL_API_DO_NOT_USE
	# define pl_addLocaleRun pl_addLocaleRun_INTERNAL_API_DO_NOT_USE	# define pl_addLocaleRun pl_addLocaleRun_INTERNAL_API_DO_NOT_USE
	# define pl_addValueRun pl_addValueRun_INTERNAL_API_DO_NOT_USE	# define pl_addValueRun pl_addValueRun_INTERNAL_API_DO_NOT_USE
	# define pl_close pl_close_INTERNAL_API_DO_NOT_USE	# define pl_close pl_close_INTERNAL_API_DO_NOT_USE
	# define pl_closeFontRuns pl_closeFontRuns_INTERNAL_API_DO_NOT_USE	# define pl_closeFontRuns pl_closeFontRuns_INTERNAL_API_DO_NOT_USE
	# define pl_closeLine pl_closeLine_INTERNAL_API_DO_NOT_USE	# define pl_closeLine pl_closeLine_INTERNAL_API_DO_NOT_USE
	# define pl_closeLocaleRuns pl_closeLocaleRuns_INTERNAL_API_DO_NOT_U SE	# define pl_closeLocaleRuns pl_closeLocaleRuns_INTERNAL_API_DO_NOT_U SE
	# define pl_closeValueRuns pl_closeValueRuns_INTERNAL_API_DO_NOT_USE	# define pl_closeValueRuns pl_closeValueRuns_INTERNAL_API_DO_NOT_USE
	# define pl_countLineRuns pl_countLineRuns_INTERNAL_API_DO_NOT_USE	# define pl_countLineRuns pl_countLineRuns_INTERNAL_API_DO_NOT_USE
	# define pl_create pl_create_INTERNAL_API_DO_NOT_USE	# define pl_create pl_create_INTERNAL_API_DO_NOT_USE

	skipping to change at line 84	skipping to change at line 95
	# define pl_openEmptyValueRuns pl_openEmptyValueRuns_INTERNAL_API_DO _NOT_USE	# define pl_openEmptyValueRuns pl_openEmptyValueRuns_INTERNAL_API_DO _NOT_USE
	# define pl_openFontRuns pl_openFontRuns_INTERNAL_API_DO_NOT_USE	# define pl_openFontRuns pl_openFontRuns_INTERNAL_API_DO_NOT_USE
	# define pl_openLocaleRuns pl_openLocaleRuns_INTERNAL_API_DO_NOT_USE	# define pl_openLocaleRuns pl_openLocaleRuns_INTERNAL_API_DO_NOT_USE
	# define pl_openValueRuns pl_openValueRuns_INTERNAL_API_DO_NOT_USE	# define pl_openValueRuns pl_openValueRuns_INTERNAL_API_DO_NOT_USE
	# define pl_paragraph pl_paragraph_INTERNAL_API_DO_NOT_USE	# define pl_paragraph pl_paragraph_INTERNAL_API_DO_NOT_USE
	# define pl_reflow pl_reflow_INTERNAL_API_DO_NOT_USE	# define pl_reflow pl_reflow_INTERNAL_API_DO_NOT_USE
	# define pl_resetFontRuns pl_resetFontRuns_INTERNAL_API_DO_NOT_USE	# define pl_resetFontRuns pl_resetFontRuns_INTERNAL_API_DO_NOT_USE
	# define pl_resetLocaleRuns pl_resetLocaleRuns_INTERNAL_API_DO_NOT_U SE	# define pl_resetLocaleRuns pl_resetLocaleRuns_INTERNAL_API_DO_NOT_U SE
	# define pl_resetValueRuns pl_resetValueRuns_INTERNAL_API_DO_NOT_USE	# define pl_resetValueRuns pl_resetValueRuns_INTERNAL_API_DO_NOT_USE
	# define pl_visualRun pl_visualRun_INTERNAL_API_DO_NOT_USE	# define pl_visualRun pl_visualRun_INTERNAL_API_DO_NOT_USE

		# define ucd_close ucd_close_INTERNAL_API_DO_NOT_USE
		# define ucd_flushCache ucd_flushCache_INTERNAL_API_DO_NOT_USE
		# define ucd_freeCache ucd_freeCache_INTERNAL_API_DO_NOT_USE
		# define ucd_getCollator ucd_getCollator_INTERNAL_API_DO_NOT_USE
		# define ucd_open ucd_open_INTERNAL_API_DO_NOT_USE
	# define ucol_equals ucol_equals_INTERNAL_API_DO_NOT_USE	# define ucol_equals ucol_equals_INTERNAL_API_DO_NOT_USE

		# define ucol_forceHanImplicit ucol_forceHanImplicit_INTERNAL_API_DO _NOT_USE
	# define ucol_forgetUCA ucol_forgetUCA_INTERNAL_API_DO_NOT_USE	# define ucol_forgetUCA ucol_forgetUCA_INTERNAL_API_DO_NOT_USE
	# define ucol_getAttributeOrDefault ucol_getAttributeOrDefault_INTER NAL_API_DO_NOT_USE	# define ucol_getAttributeOrDefault ucol_getAttributeOrDefault_INTER NAL_API_DO_NOT_USE
	# define ucol_getUnsafeSet ucol_getUnsafeSet_INTERNAL_API_DO_NOT_USE	# define ucol_getUnsafeSet ucol_getUnsafeSet_INTERNAL_API_DO_NOT_USE
	# define ucol_nextProcessed ucol_nextProcessed_INTERNAL_API_DO_NOT_U SE	# define ucol_nextProcessed ucol_nextProcessed_INTERNAL_API_DO_NOT_U SE
	# define ucol_prepareShortStringOpen ucol_prepareShortStringOpen_INT ERNAL_API_DO_NOT_USE	# define ucol_prepareShortStringOpen ucol_prepareShortStringOpen_INT ERNAL_API_DO_NOT_USE
	# define ucol_previousProcessed ucol_previousProcessed_INTERNAL_API_ DO_NOT_USE	# define ucol_previousProcessed ucol_previousProcessed_INTERNAL_API_ DO_NOT_USE

		# define udat_applyPatternRelative udat_applyPatternRelative_INTERNA
		L_API_DO_NOT_USE
		# define udat_toPatternRelativeDate udat_toPatternRelativeDate_INTER
		NAL_API_DO_NOT_USE
		# define udat_toPatternRelativeTime udat_toPatternRelativeTime_INTER
		NAL_API_DO_NOT_USE
	# define uprv_getDefaultCodepage uprv_getDefaultCodepage_INTERNAL_AP I_DO_NOT_USE	# define uprv_getDefaultCodepage uprv_getDefaultCodepage_INTERNAL_AP I_DO_NOT_USE
	# define uprv_getDefaultLocaleID uprv_getDefaultLocaleID_INTERNAL_AP I_DO_NOT_USE	# define uprv_getDefaultLocaleID uprv_getDefaultLocaleID_INTERNAL_AP I_DO_NOT_USE
	# define ures_openFillIn ures_openFillIn_INTERNAL_API_DO_NOT_USE	# define ures_openFillIn ures_openFillIn_INTERNAL_API_DO_NOT_USE
	# define usearch_search usearch_search_INTERNAL_API_DO_NOT_USE	# define usearch_search usearch_search_INTERNAL_API_DO_NOT_USE
	# define usearch_searchBackwards usearch_searchBackwards_INTERNAL_AP I_DO_NOT_USE	# define usearch_searchBackwards usearch_searchBackwards_INTERNAL_AP I_DO_NOT_USE
	# define utf8_appendCharSafeBody utf8_appendCharSafeBody_INTERNAL_AP I_DO_NOT_USE	# define utf8_appendCharSafeBody utf8_appendCharSafeBody_INTERNAL_AP I_DO_NOT_USE
	# define utf8_back1SafeBody utf8_back1SafeBody_INTERNAL_API_DO_NOT_U SE	# define utf8_back1SafeBody utf8_back1SafeBody_INTERNAL_API_DO_NOT_U SE
	# define utf8_countTrailBytes utf8_countTrailBytes_INTERNAL_API_DO_N OT_USE	# define utf8_countTrailBytes utf8_countTrailBytes_INTERNAL_API_DO_N OT_USE
	# define utf8_nextCharSafeBody utf8_nextCharSafeBody_INTERNAL_API_DO _NOT_USE	# define utf8_nextCharSafeBody utf8_nextCharSafeBody_INTERNAL_API_DO _NOT_USE
	# define utf8_prevCharSafeBody utf8_prevCharSafeBody_INTERNAL_API_DO _NOT_USE	# define utf8_prevCharSafeBody utf8_prevCharSafeBody_INTERNAL_API_DO _NOT_USE
	# else	# else

	# define RegexPatternDump_4_1.2 RegexPatternDump_INTERNAL_API_DO_NOT	# define RegexPatternDump_4_2 RegexPatternDump_INTERNAL_API_DO_NOT_U
	_USE	SE
	# define pl_addFontRun_4_1.2 pl_addFontRun_INTERNAL_API_DO_NOT_USE	# define bms.h_4_2 bms.h_INTERNAL_API_DO_NOT_USE
	# define pl_addLocaleRun_4_1.2 pl_addLocaleRun_INTERNAL_API_DO_NOT_U	# define bms_empty_4_2 bms_empty_INTERNAL_API_DO_NOT_USE
	SE	# define bms_getData_4_2 bms_getData_INTERNAL_API_DO_NOT_USE
	# define pl_addValueRun_4_1.2 pl_addValueRun_INTERNAL_API_DO_NOT_USE	# define bms_open_4_2 bms_open_INTERNAL_API_DO_NOT_USE
	# define pl_closeFontRuns_4_1.2 pl_closeFontRuns_INTERNAL_API_DO_NOT	# define bms_search_4_2 bms_search_INTERNAL_API_DO_NOT_USE
	_USE	# define bms_setTargetString_4_2 bms_setTargetString_INTERNAL_API_DO
	# define pl_closeLine_4_1.2 pl_closeLine_INTERNAL_API_DO_NOT_USE	_NOT_USE
	# define pl_closeLocaleRuns_4_1.2 pl_closeLocaleRuns_INTERNAL_API_DO	# define bmsearch.h_4_2 bmsearch.h_INTERNAL_API_DO_NOT_USE
	_NOT_USE	# define colldata.h_4_2 colldata.h_INTERNAL_API_DO_NOT_USE
	# define pl_closeValueRuns_4_1.2 pl_closeValueRuns_INTERNAL_API_DO_N	# define decimfmtAffixPatternValueComparator_4_2 decimfmtAffixPatter
	OT_USE	nValueComparator_INTERNAL_API_DO_NOT_USE
	# define pl_close_4_1.2 pl_close_INTERNAL_API_DO_NOT_USE	# define decimfmtAffixValueComparator_4_2 decimfmtAffixValueComparat
	# define pl_countLineRuns_4_1.2 pl_countLineRuns_INTERNAL_API_DO_NOT	or_INTERNAL_API_DO_NOT_USE
	_USE	# define dtitvinfHashTableValueComparator_4_2 dtitvinfHashTableValue
	# define pl_create_4_1.2 pl_create_INTERNAL_API_DO_NOT_USE	Comparator_INTERNAL_API_DO_NOT_USE
	# define pl_getAscent_4_1.2 pl_getAscent_INTERNAL_API_DO_NOT_USE	# define pl_addFontRun_4_2 pl_addFontRun_INTERNAL_API_DO_NOT_USE
	# define pl_getDescent_4_1.2 pl_getDescent_INTERNAL_API_DO_NOT_USE	# define pl_addLocaleRun_4_2 pl_addLocaleRun_INTERNAL_API_DO_NOT_USE
	# define pl_getFontRunCount_4_1.2 pl_getFontRunCount_INTERNAL_API_DO	# define pl_addValueRun_4_2 pl_addValueRun_INTERNAL_API_DO_NOT_USE
	_NOT_USE	# define pl_closeFontRuns_4_2 pl_closeFontRuns_INTERNAL_API_DO_NOT_U
	# define pl_getFontRunFont_4_1.2 pl_getFontRunFont_INTERNAL_API_DO_N	SE
	OT_USE	# define pl_closeLine_4_2 pl_closeLine_INTERNAL_API_DO_NOT_USE
	# define pl_getFontRunLastLimit_4_1.2 pl_getFontRunLastLimit_INTERNA	# define pl_closeLocaleRuns_4_2 pl_closeLocaleRuns_INTERNAL_API_DO_N
	L_API_DO_NOT_USE	OT_USE
	# define pl_getFontRunLimit_4_1.2 pl_getFontRunLimit_INTERNAL_API_DO	# define pl_closeValueRuns_4_2 pl_closeValueRuns_INTERNAL_API_DO_NOT
	_NOT_USE	_USE
	# define pl_getLeading_4_1.2 pl_getLeading_INTERNAL_API_DO_NOT_USE	# define pl_close_4_2 pl_close_INTERNAL_API_DO_NOT_USE
	# define pl_getLineAscent_4_1.2 pl_getLineAscent_INTERNAL_API_DO_NOT	# define pl_countLineRuns_4_2 pl_countLineRuns_INTERNAL_API_DO_NOT_U
	_USE	SE
	# define pl_getLineDescent_4_1.2 pl_getLineDescent_INTERNAL_API_DO_N	# define pl_create_4_2 pl_create_INTERNAL_API_DO_NOT_USE
	OT_USE	# define pl_getAscent_4_2 pl_getAscent_INTERNAL_API_DO_NOT_USE
	# define pl_getLineLeading_4_1.2 pl_getLineLeading_INTERNAL_API_DO_N	# define pl_getDescent_4_2 pl_getDescent_INTERNAL_API_DO_NOT_USE
	OT_USE	# define pl_getFontRunCount_4_2 pl_getFontRunCount_INTERNAL_API_DO_N
	# define pl_getLineVisualRun_4_1.2 pl_getLineVisualRun_INTERNAL_API_	OT_USE
	DO_NOT_USE	# define pl_getFontRunFont_4_2 pl_getFontRunFont_INTERNAL_API_DO_NOT
	# define pl_getLineWidth_4_1.2 pl_getLineWidth_INTERNAL_API_DO_NOT_U	_USE
	SE	# define pl_getFontRunLastLimit_4_2 pl_getFontRunLastLimit_INTERNAL_
	# define pl_getLocaleRunCount_4_1.2 pl_getLocaleRunCount_INTERNAL_AP	API_DO_NOT_USE
	I_DO_NOT_USE	# define pl_getFontRunLimit_4_2 pl_getFontRunLimit_INTERNAL_API_DO_N
	# define pl_getLocaleRunLastLimit_4_1.2 pl_getLocaleRunLastLimit_INT	OT_USE
	ERNAL_API_DO_NOT_USE	# define pl_getLeading_4_2 pl_getLeading_INTERNAL_API_DO_NOT_USE
	# define pl_getLocaleRunLimit_4_1.2 pl_getLocaleRunLimit_INTERNAL_AP	# define pl_getLineAscent_4_2 pl_getLineAscent_INTERNAL_API_DO_NOT_U
	I_DO_NOT_USE	SE
	# define pl_getLocaleRunLocale_4_1.2 pl_getLocaleRunLocale_INTERNAL_	# define pl_getLineDescent_4_2 pl_getLineDescent_INTERNAL_API_DO_NOT
	API_DO_NOT_USE	_USE
	# define pl_getParagraphLevel_4_1.2 pl_getParagraphLevel_INTERNAL_AP	# define pl_getLineLeading_4_2 pl_getLineLeading_INTERNAL_API_DO_NOT
	I_DO_NOT_USE	_USE
	# define pl_getTextDirection_4_1.2 pl_getTextDirection_INTERNAL_API_	# define pl_getLineVisualRun_4_2 pl_getLineVisualRun_INTERNAL_API_DO
	DO_NOT_USE	_NOT_USE
	# define pl_getValueRunCount_4_1.2 pl_getValueRunCount_INTERNAL_API_	# define pl_getLineWidth_4_2 pl_getLineWidth_INTERNAL_API_DO_NOT_USE
	DO_NOT_USE	# define pl_getLocaleRunCount_4_2 pl_getLocaleRunCount_INTERNAL_API_
	# define pl_getValueRunLastLimit_4_1.2 pl_getValueRunLastLimit_INTER	DO_NOT_USE
	NAL_API_DO_NOT_USE	# define pl_getLocaleRunLastLimit_4_2 pl_getLocaleRunLastLimit_INTER
	# define pl_getValueRunLimit_4_1.2 pl_getValueRunLimit_INTERNAL_API_	NAL_API_DO_NOT_USE
	DO_NOT_USE	# define pl_getLocaleRunLimit_4_2 pl_getLocaleRunLimit_INTERNAL_API_
	# define pl_getValueRunValue_4_1.2 pl_getValueRunValue_INTERNAL_API_	DO_NOT_USE
	DO_NOT_USE	# define pl_getLocaleRunLocale_4_2 pl_getLocaleRunLocale_INTERNAL_AP
	# define pl_getVisualRunAscent_4_1.2 pl_getVisualRunAscent_INTERNAL_	I_DO_NOT_USE
	API_DO_NOT_USE	# define pl_getParagraphLevel_4_2 pl_getParagraphLevel_INTERNAL_API_
	# define pl_getVisualRunDescent_4_1.2 pl_getVisualRunDescent_INTERNA	DO_NOT_USE
	L_API_DO_NOT_USE	# define pl_getTextDirection_4_2 pl_getTextDirection_INTERNAL_API_DO
	# define pl_getVisualRunDirection_4_1.2 pl_getVisualRunDirection_INT	_NOT_USE
	ERNAL_API_DO_NOT_USE	# define pl_getValueRunCount_4_2 pl_getValueRunCount_INTERNAL_API_DO
	# define pl_getVisualRunFont_4_1.2 pl_getVisualRunFont_INTERNAL_API_	_NOT_USE
	DO_NOT_USE	# define pl_getValueRunLastLimit_4_2 pl_getValueRunLastLimit_INTERNA
	# define pl_getVisualRunGlyphCount_4_1.2 pl_getVisualRunGlyphCount_I	L_API_DO_NOT_USE
	NTERNAL_API_DO_NOT_USE	# define pl_getValueRunLimit_4_2 pl_getValueRunLimit_INTERNAL_API_DO
	# define pl_getVisualRunGlyphToCharMap_4_1.2 pl_getVisualRunGlyphToC	_NOT_USE
	harMap_INTERNAL_API_DO_NOT_USE	# define pl_getValueRunValue_4_2 pl_getValueRunValue_INTERNAL_API_DO
	# define pl_getVisualRunGlyphs_4_1.2 pl_getVisualRunGlyphs_INTERNAL_	_NOT_USE
	API_DO_NOT_USE	# define pl_getVisualRunAscent_4_2 pl_getVisualRunAscent_INTERNAL_AP
	# define pl_getVisualRunLeading_4_1.2 pl_getVisualRunLeading_INTERNA	I_DO_NOT_USE
	L_API_DO_NOT_USE	# define pl_getVisualRunDescent_4_2 pl_getVisualRunDescent_INTERNAL_
	# define pl_getVisualRunPositions_4_1.2 pl_getVisualRunPositions_INT	API_DO_NOT_USE
	ERNAL_API_DO_NOT_USE	# define pl_getVisualRunDirection_4_2 pl_getVisualRunDirection_INTER
	# define pl_isComplex_4_1.2 pl_isComplex_INTERNAL_API_DO_NOT_USE	NAL_API_DO_NOT_USE
	# define pl_line_4_1.2 pl_line_INTERNAL_API_DO_NOT_USE	# define pl_getVisualRunFont_4_2 pl_getVisualRunFont_INTERNAL_API_DO
	# define pl_nextLine_4_1.2 pl_nextLine_INTERNAL_API_DO_NOT_USE	_NOT_USE
	# define pl_openEmptyFontRuns_4_1.2 pl_openEmptyFontRuns_INTERNAL_AP	# define pl_getVisualRunGlyphCount_4_2 pl_getVisualRunGlyphCount_INT
	I_DO_NOT_USE	ERNAL_API_DO_NOT_USE
	# define pl_openEmptyLocaleRuns_4_1.2 pl_openEmptyLocaleRuns_INTERNA	# define pl_getVisualRunGlyphToCharMap_4_2 pl_getVisualRunGlyphToCha
	L_API_DO_NOT_USE	rMap_INTERNAL_API_DO_NOT_USE
	# define pl_openEmptyValueRuns_4_1.2 pl_openEmptyValueRuns_INTERNAL_	# define pl_getVisualRunGlyphs_4_2 pl_getVisualRunGlyphs_INTERNAL_AP
	API_DO_NOT_USE	I_DO_NOT_USE
	# define pl_openFontRuns_4_1.2 pl_openFontRuns_INTERNAL_API_DO_NOT_U	# define pl_getVisualRunLeading_4_2 pl_getVisualRunLeading_INTERNAL_
	SE	API_DO_NOT_USE
	# define pl_openLocaleRuns_4_1.2 pl_openLocaleRuns_INTERNAL_API_DO_N	# define pl_getVisualRunPositions_4_2 pl_getVisualRunPositions_INTER
	OT_USE	NAL_API_DO_NOT_USE
	# define pl_openValueRuns_4_1.2 pl_openValueRuns_INTERNAL_API_DO_NOT	# define pl_isComplex_4_2 pl_isComplex_INTERNAL_API_DO_NOT_USE
	_USE	# define pl_line_4_2 pl_line_INTERNAL_API_DO_NOT_USE
	# define pl_paragraph_4_1.2 pl_paragraph_INTERNAL_API_DO_NOT_USE	# define pl_nextLine_4_2 pl_nextLine_INTERNAL_API_DO_NOT_USE
	# define pl_reflow_4_1.2 pl_reflow_INTERNAL_API_DO_NOT_USE	# define pl_openEmptyFontRuns_4_2 pl_openEmptyFontRuns_INTERNAL_API_
	# define pl_resetFontRuns_4_1.2 pl_resetFontRuns_INTERNAL_API_DO_NOT	DO_NOT_USE
	_USE	# define pl_openEmptyLocaleRuns_4_2 pl_openEmptyLocaleRuns_INTERNAL_
	# define pl_resetLocaleRuns_4_1.2 pl_resetLocaleRuns_INTERNAL_API_DO	API_DO_NOT_USE
	_NOT_USE	# define pl_openEmptyValueRuns_4_2 pl_openEmptyValueRuns_INTERNAL_AP
	# define pl_resetValueRuns_4_1.2 pl_resetValueRuns_INTERNAL_API_DO_N	I_DO_NOT_USE
	OT_USE	# define pl_openFontRuns_4_2 pl_openFontRuns_INTERNAL_API_DO_NOT_USE
	# define pl_visualRun_4_1.2 pl_visualRun_INTERNAL_API_DO_NOT_USE	# define pl_openLocaleRuns_4_2 pl_openLocaleRuns_INTERNAL_API_DO_NOT
	# define ucol_equals_4_1.2 ucol_equals_INTERNAL_API_DO_NOT_USE	_USE
	# define ucol_forgetUCA_4_1.2 ucol_forgetUCA_INTERNAL_API_DO_NOT_USE	# define pl_openValueRuns_4_2 pl_openValueRuns_INTERNAL_API_DO_NOT_U
	# define ucol_getAttributeOrDefault_4_1.2 ucol_getAttributeOrDefault	SE
	_INTERNAL_API_DO_NOT_USE	# define pl_paragraph_4_2 pl_paragraph_INTERNAL_API_DO_NOT_USE
	# define ucol_getUnsafeSet_4_1.2 ucol_getUnsafeSet_INTERNAL_API_DO_N	# define pl_reflow_4_2 pl_reflow_INTERNAL_API_DO_NOT_USE
	OT_USE	# define pl_resetFontRuns_4_2 pl_resetFontRuns_INTERNAL_API_DO_NOT_U
	# define ucol_nextProcessed_4_1.2 ucol_nextProcessed_INTERNAL_API_DO	SE
	_NOT_USE	# define pl_resetLocaleRuns_4_2 pl_resetLocaleRuns_INTERNAL_API_DO_N
	# define ucol_prepareShortStringOpen_4_1.2 ucol_prepareShortStringOp	OT_USE
	en_INTERNAL_API_DO_NOT_USE	# define pl_resetValueRuns_4_2 pl_resetValueRuns_INTERNAL_API_DO_NOT
	# define ucol_previousProcessed_4_1.2 ucol_previousProcessed_INTERNA	_USE
	L_API_DO_NOT_USE	# define pl_visualRun_4_2 pl_visualRun_INTERNAL_API_DO_NOT_USE
	# define uprv_getDefaultCodepage_4_1.2 uprv_getDefaultCodepage_INTER	# define ucd_close_4_2 ucd_close_INTERNAL_API_DO_NOT_USE
	NAL_API_DO_NOT_USE	# define ucd_flushCache_4_2 ucd_flushCache_INTERNAL_API_DO_NOT_USE
	# define uprv_getDefaultLocaleID_4_1.2 uprv_getDefaultLocaleID_INTER	# define ucd_freeCache_4_2 ucd_freeCache_INTERNAL_API_DO_NOT_USE
	NAL_API_DO_NOT_USE	# define ucd_getCollator_4_2 ucd_getCollator_INTERNAL_API_DO_NOT_USE
	# define ures_openFillIn_4_1.2 ures_openFillIn_INTERNAL_API_DO_NOT_U	# define ucd_open_4_2 ucd_open_INTERNAL_API_DO_NOT_USE
	SE	# define ucol_equals_4_2 ucol_equals_INTERNAL_API_DO_NOT_USE
	# define usearch_searchBackwards_4_1.2 usearch_searchBackwards_INTER	# define ucol_forceHanImplicit_4_2 ucol_forceHanImplicit_INTERNAL_AP
	NAL_API_DO_NOT_USE	I_DO_NOT_USE
	# define usearch_search_4_1.2 usearch_search_INTERNAL_API_DO_NOT_USE	# define ucol_forgetUCA_4_2 ucol_forgetUCA_INTERNAL_API_DO_NOT_USE
	# define utf8_appendCharSafeBody_4_1.2 utf8_appendCharSafeBody_INTER	# define ucol_getAttributeOrDefault_4_2 ucol_getAttributeOrDefault_I
	NAL_API_DO_NOT_USE	NTERNAL_API_DO_NOT_USE
	# define utf8_back1SafeBody_4_1.2 utf8_back1SafeBody_INTERNAL_API_DO	# define ucol_getUnsafeSet_4_2 ucol_getUnsafeSet_INTERNAL_API_DO_NOT
	_NOT_USE	_USE
	# define utf8_countTrailBytes_4_1.2 utf8_countTrailBytes_INTERNAL_AP	# define ucol_nextProcessed_4_2 ucol_nextProcessed_INTERNAL_API_DO_N
	I_DO_NOT_USE	OT_USE
	# define utf8_nextCharSafeBody_4_1.2 utf8_nextCharSafeBody_INTERNAL_	# define ucol_prepareShortStringOpen_4_2 ucol_prepareShortStringOpen
	API_DO_NOT_USE	_INTERNAL_API_DO_NOT_USE
	# define utf8_prevCharSafeBody_4_1.2 utf8_prevCharSafeBody_INTERNAL_	# define ucol_previousProcessed_4_2 ucol_previousProcessed_INTERNAL_
	API_DO_NOT_USE	API_DO_NOT_USE
		# define udat_applyPatternRelative_4_2 udat_applyPatternRelative_INT
		ERNAL_API_DO_NOT_USE
		# define udat_toPatternRelativeDate_4_2 udat_toPatternRelativeDate_I
		NTERNAL_API_DO_NOT_USE
		# define udat_toPatternRelativeTime_4_2 udat_toPatternRelativeTime_I
		NTERNAL_API_DO_NOT_USE
		# define uprv_getDefaultCodepage_4_2 uprv_getDefaultCodepage_INTERNA
		L_API_DO_NOT_USE
		# define uprv_getDefaultLocaleID_4_2 uprv_getDefaultLocaleID_INTERNA
		L_API_DO_NOT_USE
		# define ures_openFillIn_4_2 ures_openFillIn_INTERNAL_API_DO_NOT_USE
		# define usearch_searchBackwards_4_2 usearch_searchBackwards_INTERNA
		L_API_DO_NOT_USE
		# define usearch_search_4_2 usearch_search_INTERNAL_API_DO_NOT_USE
		# define utf8_appendCharSafeBody_4_2 utf8_appendCharSafeBody_INTERNA
		L_API_DO_NOT_USE
		# define utf8_back1SafeBody_4_2 utf8_back1SafeBody_INTERNAL_API_DO_N
		OT_USE
		# define utf8_countTrailBytes_4_2 utf8_countTrailBytes_INTERNAL_API_
		DO_NOT_USE
		# define utf8_nextCharSafeBody_4_2 utf8_nextCharSafeBody_INTERNAL_AP
		I_DO_NOT_USE
		# define utf8_prevCharSafeBody_4_2 utf8_prevCharSafeBody_INTERNAL_AP
		I_DO_NOT_USE
	# endif /* U_DISABLE_RENAMING */	# endif /* U_DISABLE_RENAMING */

	#endif /* U_HIDE_INTERNAL_API */	#endif /* U_HIDE_INTERNAL_API */
	#endif /* UINTRNAL_H */	#endif /* UINTRNAL_H */

End of changes. 5 change blocks.
	131 lines changed or deleted	182 lines changed or added

	uloc.h	uloc.h

	skipping to change at line 259	skipping to change at line 259
	#define ULOC_LANG_CAPACITY 12	#define ULOC_LANG_CAPACITY 12

	/**	/**
	* Useful constant for the maximum size of the country part of a locale ID	* Useful constant for the maximum size of the country part of a locale ID
	* (including the terminating NULL).	* (including the terminating NULL).
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	#define ULOC_COUNTRY_CAPACITY 4	#define ULOC_COUNTRY_CAPACITY 4
	/**	/**
	* Useful constant for the maximum size of the whole locale ID	* Useful constant for the maximum size of the whole locale ID

	* (including the terminating NULL).	* (including the terminating NULL and all keywords).
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/

	#define ULOC_FULLNAME_CAPACITY 56	#define ULOC_FULLNAME_CAPACITY 157

	/**	/**
	* Useful constant for the maximum size of the script part of a locale ID	* Useful constant for the maximum size of the script part of a locale ID
	* (including the terminating NULL).	* (including the terminating NULL).
	* @stable ICU 2.8	* @stable ICU 2.8
	*/	*/
	#define ULOC_SCRIPT_CAPACITY 6	#define ULOC_SCRIPT_CAPACITY 6

	/**	/**
	* Useful constant for the maximum size of keywords in a locale	* Useful constant for the maximum size of keywords in a locale
	* @stable ICU 2.8	* @stable ICU 2.8
	*/	*/
	#define ULOC_KEYWORDS_CAPACITY 50	#define ULOC_KEYWORDS_CAPACITY 50

	/**	/**

	* Useful constant for the maximum SIZE of keywords in a locale	* Useful constant for the maximum total size of keywords and their values in a locale
	* @stable ICU 2.8	* @stable ICU 2.8
	*/	*/
	#define ULOC_KEYWORD_AND_VALUES_CAPACITY 100	#define ULOC_KEYWORD_AND_VALUES_CAPACITY 100

	/**	/**
	* Character separating keywords from the locale string	* Character separating keywords from the locale string
	* different for EBCDIC - TODO	* different for EBCDIC - TODO
	* @stable ICU 2.8	* @stable ICU 2.8
	*/	*/
	#define ULOC_KEYWORD_SEPARATOR '@'	#define ULOC_KEYWORD_SEPARATOR '@'

	skipping to change at line 852	skipping to change at line 852
	*/	*/
	U_STABLE int32_t U_EXPORT2	U_STABLE int32_t U_EXPORT2
	uloc_setKeywordValue(const char* keywordName,	uloc_setKeywordValue(const char* keywordName,
	const char* keywordValue,	const char* keywordValue,
	char* buffer, int32_t bufferCapacity,	char* buffer, int32_t bufferCapacity,
	UErrorCode* status);	UErrorCode* status);

	/**	/**
	* enums for the return value for the character and line orientation	* enums for the return value for the character and line orientation
	* functions.	* functions.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	typedef enum {	typedef enum {
	ULOC_LAYOUT_LTR = 0, /* left-to-right. */	ULOC_LAYOUT_LTR = 0, /* left-to-right. */
	ULOC_LAYOUT_RTL = 1, /* right-to-left. */	ULOC_LAYOUT_RTL = 1, /* right-to-left. */
	ULOC_LAYOUT_TTB = 2, /* top-to-bottom. */	ULOC_LAYOUT_TTB = 2, /* top-to-bottom. */
	ULOC_LAYOUT_BTT = 3, /* bottom-to-top. */	ULOC_LAYOUT_BTT = 3, /* bottom-to-top. */
	ULOC_LAYOUT_UNKNOWN	ULOC_LAYOUT_UNKNOWN
	} ULayoutType;	} ULayoutType;

	/**	/**
	* Get the layout character orientation for the specified locale.	* Get the layout character orientation for the specified locale.
	*	*
	* @param localeId locale name	* @param localeId locale name
	* @param status Error status	* @param status Error status
	* @return an enum indicating the layout orientation for characters.	* @return an enum indicating the layout orientation for characters.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	U_DRAFT ULayoutType U_EXPORT2	U_DRAFT ULayoutType U_EXPORT2
	uloc_getCharacterOrientation(const char* localeId,	uloc_getCharacterOrientation(const char* localeId,
	UErrorCode *status);	UErrorCode *status);

	/**	/**
	* Get the layout line orientation for the specified locale.	* Get the layout line orientation for the specified locale.
	*	*
	* @param localeId locale name	* @param localeId locale name
	* @param status Error status	* @param status Error status
	* @return an enum indicating the layout orientation for lines.	* @return an enum indicating the layout orientation for lines.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	U_DRAFT ULayoutType U_EXPORT2	U_DRAFT ULayoutType U_EXPORT2
	uloc_getLineOrientation(const char* localeId,	uloc_getLineOrientation(const char* localeId,
	UErrorCode *status);	UErrorCode *status);

	/**	/**
	* enums for the 'outResult' parameter return value	* enums for the 'outResult' parameter return value
	* @see uloc_acceptLanguageFromHTTP	* @see uloc_acceptLanguageFromHTTP
	* @see uloc_acceptLanguage	* @see uloc_acceptLanguage
	* @stable ICU 3.2	* @stable ICU 3.2

	skipping to change at line 986	skipping to change at line 986
	*	*
	* @param localeID The locale to maximize	* @param localeID The locale to maximize
	* @param maximizedLocaleID The maximized locale	* @param maximizedLocaleID The maximized locale
	* @param maximizedLocaleIDCapacity The capacity of the maximizedLocaleID b uffer	* @param maximizedLocaleIDCapacity The capacity of the maximizedLocaleID b uffer
	* @param err Error information if maximizing the locale failed. If the le ngth	* @param err Error information if maximizing the locale failed. If the le ngth
	* of the localeID and the null-terminator is greater than the maximum allo wed size,	* of the localeID and the null-terminator is greater than the maximum allo wed size,
	* or the localeId is not well-formed, the error code is U_ILLEGAL_ARGUMENT _ERROR.	* or the localeId is not well-formed, the error code is U_ILLEGAL_ARGUMENT _ERROR.
	* @return The actual buffer size needed for the maximized locale. If it's	* @return The actual buffer size needed for the maximized locale. If it's
	* greater than maximizedLocaleIDCapacity, the returned ID will be truncate d.	* greater than maximizedLocaleIDCapacity, the returned ID will be truncate d.
	* On error, the return value is -1.	* On error, the return value is -1.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	U_DRAFT int32_t U_EXPORT2	U_DRAFT int32_t U_EXPORT2
	uloc_addLikelySubtags(const char* localeID,	uloc_addLikelySubtags(const char* localeID,
	char* maximizedLocaleID,	char* maximizedLocaleID,
	int32_t maximizedLocaleIDCapacity,	int32_t maximizedLocaleIDCapacity,
	UErrorCode* err);	UErrorCode* err);

	/**	/**
	* Minimize the subtags for a provided locale ID, per the algorithm describ ed	* Minimize the subtags for a provided locale ID, per the algorithm describ ed
	* in the following CLDR technical report:	* in the following CLDR technical report:

	skipping to change at line 1025	skipping to change at line 1025
	*	*
	* @param localeID The locale to minimize	* @param localeID The locale to minimize
	* @param minimizedLocaleID The minimized locale	* @param minimizedLocaleID The minimized locale
	* @param minimizedLocaleIDCapacity The capacity of the minimizedLocaleID b uffer	* @param minimizedLocaleIDCapacity The capacity of the minimizedLocaleID b uffer
	* @param err Error information if minimizing the locale failed. If the le ngth	* @param err Error information if minimizing the locale failed. If the le ngth
	* of the localeID and the null-terminator is greater than the maximum allo wed size,	* of the localeID and the null-terminator is greater than the maximum allo wed size,
	* or the localeId is not well-formed, the error code is U_ILLEGAL_ARGUMENT _ERROR.	* or the localeId is not well-formed, the error code is U_ILLEGAL_ARGUMENT _ERROR.
	* @return The actual buffer size needed for the minimized locale. If it's	* @return The actual buffer size needed for the minimized locale. If it's
	* greater than minimizedLocaleIDCapacity, the returned ID will be truncate d.	* greater than minimizedLocaleIDCapacity, the returned ID will be truncate d.
	* On error, the return value is -1.	* On error, the return value is -1.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	U_DRAFT int32_t U_EXPORT2	U_DRAFT int32_t U_EXPORT2
	uloc_minimizeSubtags(const char* localeID,	uloc_minimizeSubtags(const char* localeID,
	char* minimizedLocaleID,	char* minimizedLocaleID,
	int32_t minimizedLocaleIDCapacity,	int32_t minimizedLocaleIDCapacity,
	UErrorCode* err);	UErrorCode* err);


		/**
		* Returns a locale ID for the specified BCP47 language tag string.
		* If the specified language tag contains any ill-formed subtags,
		* the first such subtag and all following subtags are ignored.
		* <p>
		* This implements the 'Language-Tag' production of BCP47, and so
		* supports grandfathered (regular and irregular) as well as private
		* use language tags. Private use tags are represented as 'x-whatever',
		* and grandfathered tags are converted to their canonical replacements
		* where they exist. Note that a few grandfathered tags have no modern
		* replacement, these will be converted using the fallback described in
		* the first paragraph, so some information might be lost.
		* @param langtag the input BCP47 language tag.
		* @param localeID the output buffer receiving a locale ID for the
		* specified BCP47 language tag.
		* @param localeIDCapacity the size of the locale ID output buffer.
		* @param parsedLength if not NULL, succsessfully parsed length
		* for the input language tag is set.
		* @param err error information if receiving the locald ID
		* failed.
		* @return the length of the locale ID.
		* @draft ICU 4.2
		*/
		U_DRAFT int32_t U_EXPORT2
		uloc_forLanguageTag(const char* langtag,
		char* localeID,
		int32_t localeIDCapacity,
		int32_t* parsedLength,
		UErrorCode* err);

		/**
		* Returns a well-formed language tag for this locale ID.
		* <p>
		* <b>Note</b>: When <code>strict</code> is FALSE, any locale
		* fields which do not satisfy the BCP47 syntax requirement will
		* be omitted from the result. When <code>strict</code> is
		* TRUE, this function sets U_ILLEGAL_ARGUMENT_ERROR to the
		* <code>err</code> if any locale fields do not satisfy the
		* BCP47 syntax requirement.
		* @param localeID the input lcoale ID
		* @param langtag the output buffer receiving BCP47 language
		* tag for the locale ID.
		* @param langtagCapacity the size of the BCP47 language tag
		* output buffer.
		* @param strict boolean value indicating if the function returns
		* an error for an ill-formed input locale ID.
		* @param err error information if receiving the language
		* tag failed.
		* @return The length of the BCP47 language tag.
		* @draft ICU 4.2
		*/
		U_DRAFT int32_t U_EXPORT2
		uloc_toLanguageTag(const char* localeID,
		char* langtag,
		int32_t langtagCapacity,
		UBool strict,
		UErrorCode* err);

	#endif /_ULOC/	#endif /_ULOC/

End of changes. 9 change blocks.
	8 lines changed or deleted	66 lines changed or added

	ulocdata.h	ulocdata.h

	skipping to change at line 48	skipping to change at line 48
	typedef enum ULocaleDataExemplarSetType {	typedef enum ULocaleDataExemplarSetType {
	ULOCDATA_ES_STANDARD=0, /* Basic set */	ULOCDATA_ES_STANDARD=0, /* Basic set */
	ULOCDATA_ES_AUXILIARY=1, /* Auxiliary set */	ULOCDATA_ES_AUXILIARY=1, /* Auxiliary set */
	ULOCDATA_ES_COUNT=2	ULOCDATA_ES_COUNT=2
	} ULocaleDataExemplarSetType;	} ULocaleDataExemplarSetType;

	/** The possible types of delimiters.	/** The possible types of delimiters.
	* @stable ICU 3.4	* @stable ICU 3.4
	*/	*/
	typedef enum ULocaleDataDelimiterType {	typedef enum ULocaleDataDelimiterType {

	#ifndef U_HIDE_DRAFT_API
	ULOCDATA_QUOTATION_START = 0, /* Quotation start */	ULOCDATA_QUOTATION_START = 0, /* Quotation start */
	ULOCDATA_QUOTATION_END = 1, /* Quotation end */	ULOCDATA_QUOTATION_END = 1, /* Quotation end */
	ULOCDATA_ALT_QUOTATION_START = 2, /* Alternate quotation start */	ULOCDATA_ALT_QUOTATION_START = 2, /* Alternate quotation start */
	ULOCDATA_ALT_QUOTATION_END = 3, /* Alternate quotation end */	ULOCDATA_ALT_QUOTATION_END = 3, /* Alternate quotation end */

	#endif
	ULOCDATA_DELIMITER_COUNT = 4	ULOCDATA_DELIMITER_COUNT = 4
	} ULocaleDataDelimiterType;	} ULocaleDataDelimiterType;

	/**	/**
	* Opens a locale data object for the given locale	* Opens a locale data object for the given locale
	*	*
	* @param localeID Specifies the locale associated with this locale	* @param localeID Specifies the locale associated with this locale
	* data object.	* data object.
	* @param status Pointer to error status code.	* @param status Pointer to error status code.
	* @stable ICU 3.4	* @stable ICU 3.4

	skipping to change at line 201	skipping to change at line 199

	/**	/**
	* Return the current CLDR version used by the library.	* Return the current CLDR version used by the library.
	* @param versionArray fillin that will recieve the version number	* @param versionArray fillin that will recieve the version number
	* @param status error code - could be U_MISSING_RESOURCE_ERROR if the vers ion was not found.	* @param status error code - could be U_MISSING_RESOURCE_ERROR if the vers ion was not found.
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	U_DRAFT void U_EXPORT2	U_DRAFT void U_EXPORT2
	ulocdata_getCLDRVersion(UVersionInfo versionArray, UErrorCode *status);	ulocdata_getCLDRVersion(UVersionInfo versionArray, UErrorCode *status);


		/**
		* Returns locale display pattern associated with a locale.
		*
		* @param uld Pointer to the locale data object from which the
		* exemplar character set is to be retrieved.
		* @param pattern locale display pattern for locale.
		* @param patternCapacity the size of the buffer to store the locale displa
		y
		* pattern with.
		* @param status Must be a valid pointer to an error code value,
		* which must not indicate a failure before the function c
		all.
		* @return the actual buffer size needed for localeDisplayPattern. If it's
		greater
		* than patternCapacity, the returned pattern will be truncated.
		*
		* @draft ICU 4.2
		*/
		U_DRAFT int32_t U_EXPORT2
		ulocdata_getLocaleDisplayPattern(ULocaleData *uld,
		UChar *pattern,
		int32_t patternCapacity,
		UErrorCode *status);

		/**
		* Returns locale separator associated with a locale.
		*
		* @param uld Pointer to the locale data object from which the
		* exemplar character set is to be retrieved.
		* @param separator locale separator for locale.
		* @param separatorCapacity the size of the buffer to store the locale
		* separator with.
		* @param status Must be a valid pointer to an error code value,
		* which must not indicate a failure before the function c
		all.
		* @return the actual buffer size needed for localeSeparator. If it's grea
		ter
		* than separatorCapacity, the returned separator will be truncated.
		*
		* @draft ICU 4.2
		*/
		U_DRAFT int32_t U_EXPORT2
		ulocdata_getLocaleSeparator(ULocaleData *uld,
		UChar *separator,
		int32_t separatorCapacity,
		UErrorCode *status);
	#endif	#endif

End of changes. 3 change blocks.
	2 lines changed or deleted	46 lines changed or added

	uniset.h	uniset.h
	/*	/*
	***************************************************************************	***************************************************************************

	* Copyright (C) 1999-2008, International Business Machines Corporation	* Copyright (C) 1999-2009, International Business Machines Corporation
	* and others. All Rights Reserved.	* and others. All Rights Reserved.
	***************************************************************************	***************************************************************************
	* Date Name Description	* Date Name Description
	* 10/20/99 alan Creation.	* 10/20/99 alan Creation.
	***************************************************************************	***************************************************************************
	*/	*/

	#ifndef UNICODESET_H	#ifndef UNICODESET_H
	#define UNICODESET_H	#define UNICODESET_H


	skipping to change at line 308	skipping to change at line 308
	};	};
	uint8_t fFlags; // Bit flag (see constants above)	uint8_t fFlags; // Bit flag (see constants above)
	public:	public:
	/**	/**
	* Determine if this object contains a valid set.	* Determine if this object contains a valid set.
	* A bogus set has no value. It is different from an empty set.	* A bogus set has no value. It is different from an empty set.
	* It can be used to indicate that no set value is available.	* It can be used to indicate that no set value is available.
	*	*
	* @return TRUE if the set is valid, FALSE otherwise	* @return TRUE if the set is valid, FALSE otherwise
	* @see setToBogus()	* @see setToBogus()

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	inline UBool isBogus(void) const;	inline UBool isBogus(void) const;

	/**	/**
	* Make this UnicodeSet object invalid.	* Make this UnicodeSet object invalid.
	* The string will test TRUE with isBogus().	* The string will test TRUE with isBogus().
	*	*
	* A bogus set has no value. It is different from an empty set.	* A bogus set has no value. It is different from an empty set.
	* It can be used to indicate that no set value is available.	* It can be used to indicate that no set value is available.
	*	*
	* This utility function is used throughout the UnicodeSet	* This utility function is used throughout the UnicodeSet
	* implementation to indicate that a UnicodeSet operation failed,	* implementation to indicate that a UnicodeSet operation failed,
	* and may be used in other functions,	* and may be used in other functions,
	* especially but not exclusively when such functions do not	* especially but not exclusively when such functions do not
	* take a UErrorCode for simplicity.	* take a UErrorCode for simplicity.
	*	*
	* @see isBogus()	* @see isBogus()

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	void setToBogus();	void setToBogus();

	public:	public:

	enum {	enum {
	/**	/**
	* Minimum value that can be stored in a UnicodeSet.	* Minimum value that can be stored in a UnicodeSet.
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/

	skipping to change at line 473	skipping to change at line 473

	/**	/**
	* Returns the hash code value for this set.	* Returns the hash code value for this set.
	*	*
	* @return the hash code value for this set.	* @return the hash code value for this set.
	* @see Object#hashCode()	* @see Object#hashCode()
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	virtual int32_t hashCode(void) const;	virtual int32_t hashCode(void) const;


		/**
		* Get a UnicodeSet pointer from a USet
		*
		* @param uset a USet (the ICU plain C type for UnicodeSet)
		* @return the corresponding UnicodeSet pointer.
		*
		* @draft ICU 4.2
		*/
		inline static UnicodeSet fromUSet(USet uset);

		/**
		* Get a UnicodeSet pointer from a const USet
		*
		* @param uset a const USet (the ICU plain C type for UnicodeSet)
		* @return the corresponding UnicodeSet pointer.
		*
		* @draft ICU 4.2
		*/
		inline static const UnicodeSet fromUSet(const USet uset);

		/**
		* Produce a USet * pointer for this UnicodeSet.
		* USet is the plain C type for UnicodeSet
		*
		* @return a USet pointer for this UnicodeSet
		* @draft ICU 4.2
		*/
		inline USet *toUSet();

		/**
		* Produce a const USet * pointer for this UnicodeSet.
		* USet is the plain C type for UnicodeSet
		*
		* @return a const USet pointer for this UnicodeSet
		* @draft ICU 4.2
		*/
		inline const USet * toUSet() const;

	//----------------------------------------------------------------	//----------------------------------------------------------------
	// Freezable API	// Freezable API
	//----------------------------------------------------------------	//----------------------------------------------------------------

	/**	/**
	* Determines whether the set has been frozen (made immutable) or not.	* Determines whether the set has been frozen (made immutable) or not.
	* See the ICU4J Freezable interface for details.	* See the ICU4J Freezable interface for details.
	* @return TRUE/FALSE for whether the set has been frozen	* @return TRUE/FALSE for whether the set has been frozen
	* @see freeze	* @see freeze
	* @see cloneAsThawed	* @see cloneAsThawed

	skipping to change at line 1002	skipping to change at line 1040
	* @param s the source string	* @param s the source string
	* @return this object, for chaining	* @return this object, for chaining
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	UnicodeSet& add(const UnicodeString& s);	UnicodeSet& add(const UnicodeString& s);

	private:	private:
	/**	/**
	* @return a code point IF the string consists of a single one.	* @return a code point IF the string consists of a single one.
	* otherwise returns -1.	* otherwise returns -1.

	* @param string to test	* @param s string to test
	*/	*/
	static int32_t getSingleCP(const UnicodeString& s);	static int32_t getSingleCP(const UnicodeString& s);

	void _add(const UnicodeString& s);	void _add(const UnicodeString& s);

	public:	public:
	/**	/**
	* Adds each of the characters in this string to the set. Thus "ch" => {"c", "h"}	* Adds each of the characters in this string to the set. Thus "ch" => {"c", "h"}
	* If this set already any particular character, it has no effect on th at character.	* If this set already any particular character, it has no effect on th at character.
	* A frozen set will not be modified.	* A frozen set will not be modified.

	skipping to change at line 1254	skipping to change at line 1292
	* (Here foldCase(x) refers to the operation u_strFoldCase, and a	* (Here foldCase(x) refers to the operation u_strFoldCase, and a
	* == b denotes that the contents are the same, not pointer	* == b denotes that the contents are the same, not pointer
	* comparison.)	* comparison.)
	*	*
	* A frozen set will not be modified.	* A frozen set will not be modified.
	*	*
	* @param attribute bitmask for attributes to close over.	* @param attribute bitmask for attributes to close over.
	* Currently only the USET_CASE bit is supported. Any undefined bits	* Currently only the USET_CASE bit is supported. Any undefined bits
	* are ignored.	* are ignored.
	* @return a reference to this set.	* @return a reference to this set.

	* @internal	* @draft ICU 4.2
	*/	*/
	UnicodeSet& closeOver(int32_t attribute);	UnicodeSet& closeOver(int32_t attribute);

	/**	/**
	* Remove all strings from this set.	* Remove all strings from this set.
	*	*
	* @return a reference to this set.	* @return a reference to this set.

	* @internal	* @draft ICU 4.2
	*/	*/
	virtual UnicodeSet &removeAllStrings();	virtual UnicodeSet &removeAllStrings();

	/**	/**
	* Iteration method that returns the number of ranges contained in	* Iteration method that returns the number of ranges contained in
	* this set.	* this set.
	* @see #getRangeStart	* @see #getRangeStart
	* @see #getRangeEnd	* @see #getRangeEnd
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/

	skipping to change at line 1562	skipping to change at line 1600
	}	}

	inline UBool UnicodeSet::containsSome(const UnicodeString& s) const {	inline UBool UnicodeSet::containsSome(const UnicodeString& s) const {
	return !containsNone(s);	return !containsNone(s);
	}	}

	inline UBool UnicodeSet::isBogus() const {	inline UBool UnicodeSet::isBogus() const {
	return (UBool)(fFlags & kIsBogus);	return (UBool)(fFlags & kIsBogus);
	}	}


		inline UnicodeSet UnicodeSet::fromUSet(USet uset) {
		return reinterpret_cast<UnicodeSet *>(uset);
		}

		inline const UnicodeSet UnicodeSet::fromUSet(const USet uset) {
		return reinterpret_cast<const UnicodeSet *>(uset);
		}

		inline USet *UnicodeSet::toUSet() {
		return reinterpret_cast<USet *>(this);
		}

		inline const USet *UnicodeSet::toUSet() const {
		return reinterpret_cast<const USet *>(this);
		}

	U_NAMESPACE_END	U_NAMESPACE_END

	#endif	#endif

End of changes. 8 change blocks.
	6 lines changed or deleted	60 lines changed or added

	unistr.h	unistr.h
	/*	/*
	**********************************************************************	**********************************************************************

	* Copyright (C) 1998-2008, International Business Machines	* Copyright (C) 1998-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	**********************************************************************	**********************************************************************
	*	*
	* File unistr.h	* File unistr.h
	*	*
	* Modification History:	* Modification History:
	*	*
	* Date Name Description	* Date Name Description
	* 09/25/98 stephen Creation.	* 09/25/98 stephen Creation.
	* 11/11/98 stephen Changed per 11/9 code review.	* 11/11/98 stephen Changed per 11/9 code review.

	skipping to change at line 29	skipping to change at line 29
	*/	*/

	#ifndef UNISTR_H	#ifndef UNISTR_H
	#define UNISTR_H	#define UNISTR_H

	/**	/**
	* \file	* \file
	* \brief C++ API: Unicode String	* \brief C++ API: Unicode String
	*/	*/


		#include "unicode/utypes.h"
	#include "unicode/rep.h"	#include "unicode/rep.h"

		#include "unicode/std_string.h"
		#include "unicode/stringpiece.h"
		#include "unicode/bytestream.h"

	struct UConverter; // unicode/ucnv.h	struct UConverter; // unicode/ucnv.h
	class StringThreadTest;	class StringThreadTest;

	#ifndef U_COMPARE_CODE_POINT_ORDER	#ifndef U_COMPARE_CODE_POINT_ORDER
	/* see also ustring.h and unorm.h */	/* see also ustring.h and unorm.h */
	/**	/**
	* Option bit for u_strCaseCompare, u_strcasecmp, unorm_compare, etc:	* Option bit for u_strCaseCompare, u_strcasecmp, unorm_compare, etc:
	* Compare strings in code point order instead of code unit order.	* Compare strings in code point order instead of code unit order.
	* @stable ICU 2.2	* @stable ICU 2.2

	skipping to change at line 1445	skipping to change at line 1449
	* @param inv Signature-distinguishing paramater, use US_INV.	* @param inv Signature-distinguishing paramater, use US_INV.
	* @return the output string length, not including the terminating NUL	* @return the output string length, not including the terminating NUL
	* @stable ICU 3.2	* @stable ICU 3.2
	*/	*/
	int32_t extract(int32_t start,	int32_t extract(int32_t start,
	int32_t startLength,	int32_t startLength,
	char *target,	char *target,
	int32_t targetCapacity,	int32_t targetCapacity,
	enum EInvariant inv) const;	enum EInvariant inv) const;


		#if U_CHARSET_IS_UTF8 \|\| !UCONFIG_NO_CONVERSION

		/**
		* Copy the characters in the range
		* [<tt>start</TT>, <tt>start + length</TT>) into an array of characters
		* in the platform's default codepage.
		* This function does not write any more than <code>targetLength</code>
		* characters but returns the length of the entire output string
		* so that one can allocate a larger buffer and call the function again
		* if necessary.
		* The output string is NUL-terminated if possible.
		*
		* @param start offset of first character which will be copied
		* @param startLength the number of characters to extract
		* @param target the target buffer for extraction
		* @param targetLength the length of the target buffer
		* If <TT>target</TT> is NULL, then the number of bytes required for
		* <TT>target</TT> is returned.
		* @return the output string length, not including the terminating NUL
		* @stable ICU 2.0
		*/
		int32_t extract(int32_t start,
		int32_t startLength,
		char *target,
		uint32_t targetLength) const;

		#endif

	#if !UCONFIG_NO_CONVERSION	#if !UCONFIG_NO_CONVERSION

	/**	/**
	* Copy the characters in the range	* Copy the characters in the range
	* [<tt>start</TT>, <tt>start + length</TT>) into an array of characters	* [<tt>start</TT>, <tt>start + length</TT>) into an array of characters
	* in a specified codepage.	* in a specified codepage.
	* The output string is NUL-terminated.	* The output string is NUL-terminated.
	*	*
	* Recommendation: For invariant-character strings use	* Recommendation: For invariant-character strings use
	* extract(int32_t start, int32_t length, char *target, int32_t targetCap acity, enum EInvariant inv) const	* extract(int32_t start, int32_t length, char *target, int32_t targetCap acity, enum EInvariant inv) const

	skipping to change at line 1510	skipping to change at line 1542
	* subset ("invariant characters") of the platform encoding. See utypes.h .	* subset ("invariant characters") of the platform encoding. See utypes.h .
	* If <TT>target</TT> is NULL, then the number of bytes required for	* If <TT>target</TT> is NULL, then the number of bytes required for
	* <TT>target</TT> is returned.	* <TT>target</TT> is returned.
	* @return the output string length, not including the terminating NUL	* @return the output string length, not including the terminating NUL
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	int32_t extract(int32_t start,	int32_t extract(int32_t start,
	int32_t startLength,	int32_t startLength,
	char *target,	char *target,
	uint32_t targetLength,	uint32_t targetLength,

	const char *codepage = 0) const;	const char *codepage) const;

	/**	/**
	* Convert the UnicodeString into a codepage string using an existing UCo nverter.	* Convert the UnicodeString into a codepage string using an existing UCo nverter.
	* The output string is NUL-terminated if possible.	* The output string is NUL-terminated if possible.
	*	*
	* This function avoids the overhead of opening and closing a converter i f	* This function avoids the overhead of opening and closing a converter i f
	* multiple strings are extracted.	* multiple strings are extracted.
	*	*
	* @param dest destination string buffer, can be NULL if destCapacity==0	* @param dest destination string buffer, can be NULL if destCapacity==0
	* @param destCapacity the number of chars available at dest	* @param destCapacity the number of chars available at dest

	skipping to change at line 1535	skipping to change at line 1567
	* if the length is greater than destCapacity, then the string wi ll not fit	* if the length is greater than destCapacity, then the string wi ll not fit
	* and a buffer of the indicated length would need to be passed i n	* and a buffer of the indicated length would need to be passed i n
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	int32_t extract(char *dest, int32_t destCapacity,	int32_t extract(char *dest, int32_t destCapacity,
	UConverter *cnv,	UConverter *cnv,
	UErrorCode &errorCode) const;	UErrorCode &errorCode) const;

	#endif	#endif


		/**
		* Convert the UnicodeString to UTF-8 and write the result
		* to a ByteSink. This is called by toUTF8String().
		* Unpaired surrogates are replaced with U+FFFD.
		* Calls u_strToUTF8WithSub().
		*
		* @param sink A ByteSink to which the UTF-8 version of the string is wri
		tten.
		* @draft ICU 4.2
		* @see toUTF8String
		*/
		void toUTF8(ByteSink &sink) const;

		#if U_HAVE_STD_STRING

		/**
		* Convert the UnicodeString to UTF-8 and append the result
		* to a standard string.
		* Unpaired surrogates are replaced with U+FFFD.
		* Calls toUTF8().
		*
		* @param A standard string (or a compatible object)
		* to which the UTF-8 version of the string is appended.
		* @return The string object.
		* @draft ICU 4.2
		* @see toUTF8
		*/
		template<typename StringClass>
		StringClass &toUTF8String(StringClass &result) const {
		StringByteSink<StringClass> sbs(&result);
		toUTF8(sbs);
		return result;
		}

		#endif

		/**
		* Convert the UnicodeString to UTF-32.
		* Unpaired surrogates are replaced with U+FFFD.
		* Calls u_strToUTF32WithSub().
		*
		* @param utf32 destination string buffer, can be NULL if capacity==0
		* @param capacity the number of UChar32s available at utf32
		* @param errorCode Standard ICU error code. Its input value must
		* pass the U_SUCCESS() test, or else the function retur
		ns
		* immediately. Check for U_FAILURE() on output or use w
		ith
		* function chaining. (See User Guide for details.)
		* @return The length of the UTF-32 string.
		* @see fromUTF32
		* @draft ICU 4.2
		*/
		int32_t toUTF32(UChar32 *utf32, int32_t capacity, UErrorCode &errorCode)
		const;

	/* Length operations */	/* Length operations */

	/**	/**
	* Return the length of the UnicodeString object.	* Return the length of the UnicodeString object.
	* The length is the number of UChar code units are in the UnicodeString.	* The length is the number of UChar code units are in the UnicodeString.
	* If you want the number of code points, please use countChar32().	* If you want the number of code points, please use countChar32().
	* @return the length of the UnicodeString object	* @return the length of the UnicodeString object
	* @see countChar32	* @see countChar32
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/

	skipping to change at line 2749	skipping to change at line 2833
	* The extract(UChar *dst) function detects whether the dst pointer is th e same	* The extract(UChar *dst) function detects whether the dst pointer is th e same
	* as the string buffer itself and will in this case not copy the content s.	* as the string buffer itself and will in this case not copy the content s.
	*	*
	* @param buffer The characters to alias for the UnicodeString.	* @param buffer The characters to alias for the UnicodeString.
	* @param buffLength The number of Unicode characters in <code>buffer</co de> to alias.	* @param buffLength The number of Unicode characters in <code>buffer</co de> to alias.
	* @param buffCapacity The size of <code>buffer</code> in UChars.	* @param buffCapacity The size of <code>buffer</code> in UChars.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	UnicodeString(UChar *buffer, int32_t buffLength, int32_t buffCapacity);	UnicodeString(UChar *buffer, int32_t buffLength, int32_t buffCapacity);


		#if U_CHARSET_IS_UTF8 \|\| !UCONFIG_NO_CONVERSION

		/**
		* char* constructor.
		* @param codepageData an array of bytes, null-terminated,
		* in the platform's default codepage.
		* @stable ICU 2.0
		*/
		UnicodeString(const char *codepageData);

		/**
		* char* constructor.
		* @param codepageData an array of bytes in the platform's default codepa
		ge.
		* @param dataLength The number of bytes in <TT>codepageData</TT>.
		* @stable ICU 2.0
		*/
		UnicodeString(const char *codepageData, int32_t dataLength);

		#endif

	#if !UCONFIG_NO_CONVERSION	#if !UCONFIG_NO_CONVERSION

	/**	/**
	* char* constructor.	* char* constructor.
	* @param codepageData an array of bytes, null-terminated	* @param codepageData an array of bytes, null-terminated
	* @param codepage the encoding of <TT>codepageData</TT>. The special	* @param codepage the encoding of <TT>codepageData</TT>. The special
	* value 0 for <TT>codepage</TT> indicates that the text is in the	* value 0 for <TT>codepage</TT> indicates that the text is in the
	* platform's default codepage.	* platform's default codepage.
	*	*
	* If <code>codepage</code> is an empty string (<code>""</code>),	* If <code>codepage</code> is an empty string (<code>""</code>),
	* then a simple conversion is performed on the codepage-invariant	* then a simple conversion is performed on the codepage-invariant
	* subset ("invariant characters") of the platform encoding. See utypes.h .	* subset ("invariant characters") of the platform encoding. See utypes.h .
	* Recommendation: For invariant-character strings use the constructor	* Recommendation: For invariant-character strings use the constructor
	* UnicodeString(const char *src, int32_t length, enum EInvariant inv)	* UnicodeString(const char *src, int32_t length, enum EInvariant inv)
	* because it avoids object code dependencies of UnicodeString on	* because it avoids object code dependencies of UnicodeString on
	* the conversion code.	* the conversion code.
	*	*
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/

	UnicodeString(const char *codepageData,	UnicodeString(const char codepageData, const char codepage);
	const char *codepage = 0);

	/**	/**
	* char* constructor.	* char* constructor.
	* @param codepageData an array of bytes.	* @param codepageData an array of bytes.
	* @param dataLength The number of bytes in <TT>codepageData</TT>.	* @param dataLength The number of bytes in <TT>codepageData</TT>.
	* @param codepage the encoding of <TT>codepageData</TT>. The special	* @param codepage the encoding of <TT>codepageData</TT>. The special
	* value 0 for <TT>codepage</TT> indicates that the text is in the	* value 0 for <TT>codepage</TT> indicates that the text is in the
	* platform's default codepage.	* platform's default codepage.
	* If <code>codepage</code> is an empty string (<code>""</code>),	* If <code>codepage</code> is an empty string (<code>""</code>),
	* then a simple conversion is performed on the codepage-invariant	* then a simple conversion is performed on the codepage-invariant
	* subset ("invariant characters") of the platform encoding. See utypes.h .	* subset ("invariant characters") of the platform encoding. See utypes.h .
	* Recommendation: For invariant-character strings use the constructor	* Recommendation: For invariant-character strings use the constructor
	* UnicodeString(const char *src, int32_t length, enum EInvariant inv)	* UnicodeString(const char *src, int32_t length, enum EInvariant inv)
	* because it avoids object code dependencies of UnicodeString on	* because it avoids object code dependencies of UnicodeString on
	* the conversion code.	* the conversion code.
	*	*
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/

	UnicodeString(const char *codepageData,	UnicodeString(const char codepageData, int32_t dataLength, const char c
	int32_t dataLength,	odepage);
	const char *codepage = 0);

	/**	/**
	* char * / UConverter constructor.	* char * / UConverter constructor.
	* This constructor uses an existing UConverter object to	* This constructor uses an existing UConverter object to
	* convert the codepage string to Unicode and construct a UnicodeString	* convert the codepage string to Unicode and construct a UnicodeString
	* from that.	* from that.
	*	*
	* The converter is reset at first.	* The converter is reset at first.
	* If the error code indicates a failure before this constructor is calle d,	* If the error code indicates a failure before this constructor is calle d,
	* or if an error occurs during conversion or construction,	* or if an error occurs during conversion or construction,

	skipping to change at line 2893	skipping to change at line 2994
	* @see getDynamicClassID	* @see getDynamicClassID
	* @stable ICU 2.6	* @stable ICU 2.6
	*/	*/
	virtual Replaceable *clone() const;	virtual Replaceable *clone() const;

	/** Destructor.	/** Destructor.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	virtual ~UnicodeString();	virtual ~UnicodeString();


		/**
		* Create a UnicodeString from a UTF-8 string.
		* Illegal input is replaced with U+FFFD. Otherwise, errors result in a b
		ogus string.
		* Calls u_strFromUTF8WithSub().
		*
		* @param utf8 UTF-8 input string.
		* Note that a StringPiece can be implicitly constructed
		* from a std::string or a NUL-terminated const char * string
		.
		* @return A UnicodeString with equivalent UTF-16 contents.
		* @see toUTF8
		* @see toUTF8String
		* @draft ICU 4.2
		*/
		static UnicodeString fromUTF8(const StringPiece &utf8);

		/**
		* Create a UnicodeString from a UTF-32 string.
		* Illegal input is replaced with U+FFFD. Otherwise, errors result in a b
		ogus string.
		* Calls u_strFromUTF32WithSub().
		*
		* @param utf32 UTF-32 input string. Must not be NULL.
		* @param length Length of the input string, or -1 if NUL-terminated.
		* @return A UnicodeString with equivalent UTF-16 contents.
		* @see toUTF32
		* @draft ICU 4.2
		*/
		static UnicodeString fromUTF32(const UChar32 *utf32, int32_t length);

	/* Miscellaneous operations */	/* Miscellaneous operations */

	/**	/**
	* Unescape a string of characters and return a string containing	* Unescape a string of characters and return a string containing
	* the result. The following escape sequences are recognized:	* the result. The following escape sequences are recognized:
	*	*
	* \\uhhhh 4 hex digits; h in [0-9A-Fa-f]	* \\uhhhh 4 hex digits; h in [0-9A-Fa-f]
	* \\Uhhhhhhhh 8 hex digits	* \\Uhhhhhhhh 8 hex digits
	* \\xhh 1-2 hex digits	* \\xhh 1-2 hex digits
	* \\ooo 1-3 octal digits; o in [0-7]	* \\ooo 1-3 octal digits; o in [0-7]

	skipping to change at line 2992	skipping to change at line 3121
	virtual UChar getCharAt(int32_t offset) const;	virtual UChar getCharAt(int32_t offset) const;

	/**	/**
	* The change in Replaceable to use virtual getChar32At() allows	* The change in Replaceable to use virtual getChar32At() allows
	* UnicodeString::char32At() to be inline again (see jitterbug 709).	* UnicodeString::char32At() to be inline again (see jitterbug 709).
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	virtual UChar32 getChar32At(int32_t offset) const;	virtual UChar32 getChar32At(int32_t offset) const;

	private:	private:

		// For char* constructors. Could be made public.
		UnicodeString &setToUTF8(const StringPiece &utf8);
		// For extract(char*).
		// We could make a toUTF8(target, capacity, errorCode) public but not
		// this version: New API will be cleaner if we make callers create substr
		ings
		// rather than having start+length on every method,
		// and it should take a UErrorCode&.
		int32_t
		toUTF8(int32_t start, int32_t len,
		char *target, int32_t capacity) const;

	inline int8_t	inline int8_t
	doCompare(int32_t start,	doCompare(int32_t start,
	int32_t length,	int32_t length,
	const UnicodeString& srcText,	const UnicodeString& srcText,
	int32_t srcStart,	int32_t srcStart,
	int32_t srcLength) const;	int32_t srcLength) const;

	int8_t doCompare(int32_t start,	int8_t doCompare(int32_t start,
	int32_t length,	int32_t length,

	skipping to change at line 4015	skipping to change at line 4154
	fUnion.fFields.fCapacity = capacity;	fUnion.fFields.fCapacity = capacity;
	}	}

	inline const UChar *	inline const UChar *
	UnicodeString::getTerminatedBuffer() {	UnicodeString::getTerminatedBuffer() {
	if(!isWritable()) {	if(!isWritable()) {
	return 0;	return 0;
	} else {	} else {
	UChar *array = getArrayStart();	UChar *array = getArrayStart();
	int32_t len = length();	int32_t len = length();

		#ifndef U_VALGRIND
	if(len < getCapacity() && array[len] == 0) {	if(len < getCapacity() && array[len] == 0) {
	return array;	return array;

	} else if(cloneArrayIfNeeded(len+1)) {	}
		#endif
		if(cloneArrayIfNeeded(len+1)) {
	array = getArrayStart();	array = getArrayStart();
	array[len] = 0;	array[len] = 0;
	return array;	return array;
	} else {	} else {
	return 0;	return 0;
	}	}
	}	}
	}	}

	inline UnicodeString&	inline UnicodeString&

End of changes. 13 change blocks.
	8 lines changed or deleted	160 lines changed or added

	unum.h	unum.h

	skipping to change at line 514	skipping to change at line 514
	int32_t patternLength,	int32_t patternLength,
	UParseError *parseError,	UParseError *parseError,
	UErrorCode *status	UErrorCode *status
	);	);

	/**	/**
	* Get a locale for which decimal formatting patterns are available.	* Get a locale for which decimal formatting patterns are available.
	* A UNumberFormat in a locale returned by this function will perform the co rrect	* A UNumberFormat in a locale returned by this function will perform the co rrect
	* formatting and parsing for the locale. The results of this call are not	* formatting and parsing for the locale. The results of this call are not
	* valid for rule-based number formats.	* valid for rule-based number formats.

	* @param index The index of the desired locale.	* @param localeIndex The index of the desired locale.
	* @return A locale for which number formatting patterns are available, or 0 if none.	* @return A locale for which number formatting patterns are available, or 0 if none.
	* @see unum_countAvailable	* @see unum_countAvailable
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE const char* U_EXPORT2	U_STABLE const char* U_EXPORT2

	unum_getAvailable(int32_t index);	unum_getAvailable(int32_t localeIndex);

	/**	/**
	* Determine how many locales have decimal formatting patterns available. T he	* Determine how many locales have decimal formatting patterns available. T he
	* results of this call are not valid for rule-based number formats.	* results of this call are not valid for rule-based number formats.
	* This function is useful for determining the loop ending condition for	* This function is useful for determining the loop ending condition for
	* calls to {@link #unum_getAvailable }.	* calls to {@link #unum_getAvailable }.
	* @return The number of locales for which decimal formatting patterns are a vailable.	* @return The number of locales for which decimal formatting patterns are a vailable.
	* @see unum_getAvailable	* @see unum_getAvailable
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	uobject.h	uobject.h
	/*	/*
	************************************************************************* *	************************************************************************* *
	*	*

	* Copyright (C) 2002-2008, International Business Machines	* Copyright (C) 2002-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	*	*
	************************************************************************* *	************************************************************************* *
	* file name: uobject.h	* file name: uobject.h
	* encoding: US-ASCII	* encoding: US-ASCII
	* tab size: 8 (not used)	* tab size: 8 (not used)
	* indentation:4	* indentation:4
	*	*
	* created on: 2002jun26	* created on: 2002jun26
	* created by: Markus W. Scherer	* created by: Markus W. Scherer

	skipping to change at line 43	skipping to change at line 43
	* memory allocation. On Windows, this allows the ICU DLL to be use d by	* memory allocation. On Windows, this allows the ICU DLL to be use d by
	* applications that statically link the C Runtime library, meaning that	* applications that statically link the C Runtime library, meaning that
	* the app and ICU will be using different heaps.	* the app and ICU will be using different heaps.
	*	*
	* @stable ICU 2.2	* @stable ICU 2.2
	*/	*/
	#ifndef U_OVERRIDE_CXX_ALLOCATION	#ifndef U_OVERRIDE_CXX_ALLOCATION
	#define U_OVERRIDE_CXX_ALLOCATION 1	#define U_OVERRIDE_CXX_ALLOCATION 1
	#endif	#endif


	/** U_HAVE_PLACEMENT_NEW - Define this to define the placement new and	/**
		* \def U_HAVE_PLACEMENT_NEW
		* Define this to define the placement new and
	* delete in UMemory for STL.	* delete in UMemory for STL.
	*	*
	* @stable ICU 2.6	* @stable ICU 2.6
	*/	*/
	#ifndef U_HAVE_PLACEMENT_NEW	#ifndef U_HAVE_PLACEMENT_NEW
	#define U_HAVE_PLACEMENT_NEW 1	#define U_HAVE_PLACEMENT_NEW 1
	#endif	#endif


	/** U_HAVE_DEBUG_LOCATION_NEW - Define this to define the MFC debug	/**
		* \def U_HAVE_DEBUG_LOCATION_NEW
		* Define this to define the MFC debug
	* version of the operator new.	* version of the operator new.
	*	*
	* @stable ICU 3.4	* @stable ICU 3.4
	*/	*/
	#ifndef U_HAVE_DEBUG_LOCATION_NEW	#ifndef U_HAVE_DEBUG_LOCATION_NEW
	#define U_HAVE_DEBUG_LOCATION_NEW 0	#define U_HAVE_DEBUG_LOCATION_NEW 0
	#endif	#endif


	/** U_NO_THROW - Define this to define the throw() specification so	/**
		* \def U_NO_THROW
		* Define this to define the throw() specification so
	certain functions do not throw any exceptions	certain functions do not throw any exceptions
	*	*
	* UMemory operator new methods should have the throw() specificati on	* UMemory operator new methods should have the throw() specificati on
	* appended to them, so that the compiler adds the additional NULL check	* appended to them, so that the compiler adds the additional NULL check

	* before calling constructors. Without, if operator new returns NU LL the	* before calling constructors. Without, if <code>operator new</cod e> returns NULL the
	* constructor is still called, and if the constructor references m ember	* constructor is still called, and if the constructor references m ember
	* data, (which it typically does), the result is a segmentation vi olation.	* data, (which it typically does), the result is a segmentation vi olation.
	*	*

	* @new ICU 4.2	* @draft ICU 4.2
	*/	*/
	#ifndef U_NO_THROW	#ifndef U_NO_THROW
	#define U_NO_THROW throw()	#define U_NO_THROW throw()
	#endif	#endif

	/**	/**
	* UMemory is the common ICU base class.	* UMemory is the common ICU base class.
	* All other ICU C++ classes are derived from UMemory (starting with ICU 2. 4).	* All other ICU C++ classes are derived from UMemory (starting with ICU 2. 4).
	*	*
	* This is primarily to make it possible and simple to override the	* This is primarily to make it possible and simple to override the

End of changes. 6 change blocks.
	6 lines changed or deleted	12 lines changed or added

	uset.h	uset.h
	/*	/*
	************************************************************************* **	************************************************************************* **
	*	*

	* Copyright (C) 2002-2008, International Business Machines	* Copyright (C) 2002-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	*	*
	************************************************************************* **	************************************************************************* **
	* file name: uset.h	* file name: uset.h
	* encoding: US-ASCII	* encoding: US-ASCII
	* tab size: 8 (not used)	* tab size: 8 (not used)
	* indentation:4	* indentation:4
	*	*
	* created on: 2002mar07	* created on: 2002mar07
	* created by: Markus W. Scherer	* created by: Markus W. Scherer

	skipping to change at line 99	skipping to change at line 99
	*/	*/
	USET_ADD_CASE_MAPPINGS = 4,	USET_ADD_CASE_MAPPINGS = 4,

	/**	/**
	* Enough for any single-code point set	* Enough for any single-code point set
	* @internal	* @internal
	*/	*/
	USET_SERIALIZED_STATIC_ARRAY_CAPACITY=8	USET_SERIALIZED_STATIC_ARRAY_CAPACITY=8
	};	};


	#ifndef U_HIDE_DRAFT_API

	/**	/**
	* Argument values for whether span() and similar functions continue while	* Argument values for whether span() and similar functions continue while
	* the current character is contained vs. not contained in the set.	* the current character is contained vs. not contained in the set.
	*	*
	* The functionality is straightforward for sets with only single code poin ts,	* The functionality is straightforward for sets with only single code poin ts,
	* without strings (which is the common case):	* without strings (which is the common case):
	* - USET_SPAN_CONTAINED and USET_SPAN_SIMPLE	* - USET_SPAN_CONTAINED and USET_SPAN_SIMPLE
	* work the same.	* work the same.
	* - span() and spanBack() partition any string the same way when	* - span() and spanBack() partition any string the same way when
	* alternating between span(USET_SPAN_NOT_CONTAINED) and	* alternating between span(USET_SPAN_NOT_CONTAINED) and

	skipping to change at line 210	skipping to change at line 208
	* @stable ICU 3.8	* @stable ICU 3.8
	*/	*/
	USET_SPAN_SIMPLE = 2,	USET_SPAN_SIMPLE = 2,
	/**	/**
	* One more than the last span condition.	* One more than the last span condition.
	* @stable ICU 3.8	* @stable ICU 3.8
	*/	*/
	USET_SPAN_CONDITION_COUNT	USET_SPAN_CONDITION_COUNT
	} USetSpanCondition;	} USetSpanCondition;


	#endif /* U_HIDE_DRAFT_API */

	/**	/**
	* A serialized form of a Unicode set. Limited manipulations are	* A serialized form of a Unicode set. Limited manipulations are
	* possible directly on a serialized set. See below.	* possible directly on a serialized set. See below.
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	typedef struct USerializedSet {	typedef struct USerializedSet {
	/**	/**
	* The serialized Unicode Set.	* The serialized Unicode Set.
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/

	skipping to change at line 245	skipping to change at line 241
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	uint16_t staticArray[USET_SERIALIZED_STATIC_ARRAY_CAPACITY];	uint16_t staticArray[USET_SERIALIZED_STATIC_ARRAY_CAPACITY];
	} USerializedSet;	} USerializedSet;

	/*********************************************************************	/*********************************************************************
	* USet API	* USet API
	*********************************************************************/	*********************************************************************/

	/**	/**

		* Create an empty USet object.
		* Equivalent to uset_open(1, 0).
		* @return a newly created USet. The caller must call uset_close() on
		* it when done.
		* @draft ICU 4.2
		*/
		U_DRAFT USet* U_EXPORT2
		uset_openEmpty();

		/**
	* Creates a USet object that contains the range of characters	* Creates a USet object that contains the range of characters
	* start..end, inclusive. If <code>start > end</code>	* start..end, inclusive. If <code>start > end</code>

	* then an empty set is created.	* then an empty set is created (same as using uset_openEmpty()).
	* @param start first character of the range, inclusive	* @param start first character of the range, inclusive
	* @param end last character of the range, inclusive	* @param end last character of the range, inclusive
	* @return a newly created USet. The caller must call uset_close() on	* @return a newly created USet. The caller must call uset_close() on
	* it when done.	* it when done.
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	U_STABLE USet* U_EXPORT2	U_STABLE USet* U_EXPORT2
	uset_open(UChar32 start, UChar32 end);	uset_open(UChar32 start, UChar32 end);

	/**	/**

	skipping to change at line 680	skipping to change at line 686
	* Removes all of the elements from this set. This set will be	* Removes all of the elements from this set. This set will be
	* empty after this call returns.	* empty after this call returns.
	* A frozen set will not be modified.	* A frozen set will not be modified.
	* @param set the set	* @param set the set
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	U_STABLE void U_EXPORT2	U_STABLE void U_EXPORT2
	uset_clear(USet* set);	uset_clear(USet* set);

	/**	/**

		* Close this set over the given attribute. For the attribute
		* USET_CASE, the result is to modify this set so that:
		*
		* 1. For each character or string 'a' in this set, all strings or
		* characters 'b' such that foldCase(a) == foldCase(b) are added
		* to this set.
		*
		* 2. For each string 'e' in the resulting set, if e !=
		* foldCase(e), 'e' will be removed.
		*
		* Example: [aq\\u00DF{Bc}{bC}{Fi}] => [aAqQ\\u00DF\\uFB01{ss}{bc}{fi}]
		*
		* (Here foldCase(x) refers to the operation u_strFoldCase, and a
		* == b denotes that the contents are the same, not pointer
		* comparison.)
		*
		* A frozen set will not be modified.
		*
		* @param set the set
		*
		* @param attributes bitmask for attributes to close over.
		* Currently only the USET_CASE bit is supported. Any undefined bits
		* are ignored.
		* @draft ICU 4.2
		*/
		U_DRAFT void U_EXPORT2
		uset_closeOver(USet* set, int32_t attributes);

		/**
		* Remove all strings from this set.
		*
		* @param set the set
		* @draft ICU 4.2
		*/
		U_DRAFT void U_EXPORT2
		uset_removeAllStrings(USet* set);

		/**
	* Returns TRUE if the given USet contains no characters and no	* Returns TRUE if the given USet contains no characters and no
	* strings.	* strings.
	* @param set the set	* @param set the set
	* @return true if set is empty	* @return true if set is empty
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	U_STABLE UBool U_EXPORT2	U_STABLE UBool U_EXPORT2
	uset_isEmpty(const USet* set);	uset_isEmpty(const USet* set);

	/**	/**

	skipping to change at line 742	skipping to change at line 786
	*/	*/
	U_STABLE int32_t U_EXPORT2	U_STABLE int32_t U_EXPORT2
	uset_indexOf(const USet* set, UChar32 c);	uset_indexOf(const USet* set, UChar32 c);

	/**	/**
	* Returns the character at the given index within this set, where	* Returns the character at the given index within this set, where
	* the set is ordered by ascending code point. If the index is	* the set is ordered by ascending code point. If the index is
	* out of range, return (UChar32)-1. The inverse of this method is	* out of range, return (UChar32)-1. The inverse of this method is
	* <code>indexOf()</code>.	* <code>indexOf()</code>.
	* @param set the set	* @param set the set

	* @param index an index from 0..size()-1 to obtain the char for	* @param charIndex an index from 0..size()-1 to obtain the char for
	* @return the character at the given index, or (UChar32)-1.	* @return the character at the given index, or (UChar32)-1.
	* @stable ICU 3.2	* @stable ICU 3.2
	*/	*/
	U_STABLE UChar32 U_EXPORT2	U_STABLE UChar32 U_EXPORT2

	uset_charAt(const USet* set, int32_t index);	uset_charAt(const USet* set, int32_t charIndex);

	/**	/**
	* Returns the number of characters and strings contained in the given	* Returns the number of characters and strings contained in the given
	* USet.	* USet.
	* @param set the set	* @param set the set
	* @return a non-negative integer counting the characters and strings	* @return a non-negative integer counting the characters and strings
	* contained in set	* contained in set
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	U_STABLE int32_t U_EXPORT2	U_STABLE int32_t U_EXPORT2

End of changes. 8 change blocks.
	8 lines changed or deleted	52 lines changed or added

	ushape.h	ushape.h
	/*	/*
	************************************************************************* *	************************************************************************* *
	*	*

	* Copyright (C) 2000-2007, International Business Machines	* Copyright (C) 2000-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	*	*
	************************************************************************* *	************************************************************************* *
	* file name: ushape.h	* file name: ushape.h
	* encoding: US-ASCII	* encoding: US-ASCII
	* tab size: 8 (not used)	* tab size: 8 (not used)
	* indentation:4	* indentation:4
	*	*
	* created on: 2000jun29	* created on: 2000jun29
	* created by: Markus W. Scherer	* created by: Markus W. Scherer

	skipping to change at line 107	skipping to change at line 107
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE int32_t U_EXPORT2	U_STABLE int32_t U_EXPORT2
	u_shapeArabic(const UChar *source, int32_t sourceLength,	u_shapeArabic(const UChar *source, int32_t sourceLength,
	UChar *dest, int32_t destSize,	UChar *dest, int32_t destSize,
	uint32_t options,	uint32_t options,
	UErrorCode *pErrorCode);	UErrorCode *pErrorCode);

	/**	/**
	* Memory option: allow the result to have a different length than the sour ce.	* Memory option: allow the result to have a different length than the sour ce.

		* Affects: LamAlef options
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	#define U_SHAPE_LENGTH_GROW_SHRINK 0	#define U_SHAPE_LENGTH_GROW_SHRINK 0

	/**	/**

		* Memory option: allow the result to have a different length than the sour
		ce.
		* Affects: LamAlef options
		* This option is an alias to U_SHAPE_LENGTH_GROW_SHRINK
		*/
		#define U_SHAPE_LAMALEF_RESIZE 0

		/**
	* Memory option: the result must have the same length as the source.	* Memory option: the result must have the same length as the source.
	* If more room is necessary, then try to consume spaces next to modified c haracters.	* If more room is necessary, then try to consume spaces next to modified c haracters.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	#define U_SHAPE_LENGTH_FIXED_SPACES_NEAR 1	#define U_SHAPE_LENGTH_FIXED_SPACES_NEAR 1

	/**	/**
	* Memory option: the result must have the same length as the source.	* Memory option: the result must have the same length as the source.

		* If more room is necessary, then try to consume spaces next to modified c
		haracters.
		* Affects: LamAlef options
		* This option is an alias to U_SHAPE_LENGTH_FIXED_SPACES_NEAR
		*/
		#define U_SHAPE_LAMALEF_NEAR 1

		/**
		* Memory option: the result must have the same length as the source.
	* If more room is necessary, then try to consume spaces at the end of the text.	* If more room is necessary, then try to consume spaces at the end of the text.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	#define U_SHAPE_LENGTH_FIXED_SPACES_AT_END 2	#define U_SHAPE_LENGTH_FIXED_SPACES_AT_END 2

	/**	/**
	* Memory option: the result must have the same length as the source.	* Memory option: the result must have the same length as the source.

		* If more room is necessary, then try to consume spaces at the end of the
		text.
		* Affects: LamAlef options
		* This option is an alias to U_SHAPE_LENGTH_FIXED_SPACES_AT_END
		*/
		#define U_SHAPE_LAMALEF_END 2

		/**
		* Memory option: the result must have the same length as the source.
	* If more room is necessary, then try to consume spaces at the beginning o f the text.	* If more room is necessary, then try to consume spaces at the beginning o f the text.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	#define U_SHAPE_LENGTH_FIXED_SPACES_AT_BEGINNING 3	#define U_SHAPE_LENGTH_FIXED_SPACES_AT_BEGINNING 3


		/**
		* Memory option: the result must have the same length as the source.
		* If more room is necessary, then try to consume spaces at the beginning o
		f the text.
		* Affects: LamAlef options
		* This option is an alias to U_SHAPE_LENGTH_FIXED_SPACES_AT_BEGINNING
		*/
		#define U_SHAPE_LAMALEF_BEGIN 3

		/**
		* Memory option: the result must have the same length as the source.
		* Shaping Mode: For each LAMALEF character found, expand LAMALEF using spa
		ce at end.
		* If there is no space at end, use spaces at beginning of th
		e buffer. If there
		* is no space at beginning of the buffer, use spaces at the
		near (i.e. the space
		* after the LAMALEF character).
		* If there are no spaces found, an error U_NO_SPACE_AVAILABL
		E (as defined in utypes.h)
		* will be set in pErrorCode
		*
		* Deshaping Mode: Perform the same function as the flag equals U_SHAPE_LAM
		ALEF_END.
		* Affects: LamAlef options
		*/
		#define U_SHAPE_LAMALEF_AUTO 0x10000

	/** Bit mask for memory options. @stable ICU 2.0 */	/** Bit mask for memory options. @stable ICU 2.0 */

	#define U_SHAPE_LENGTH_MASK 3	#define U_SHAPE_LENGTH_MASK 0x10003 /* Changed old val
		ue 3 */

		/** Bit mask for LamAlef memory options. */
		#define U_SHAPE_LAMALEF_MASK 0x10003 /* updated */

	/** Direction indicator: the source is in logical (keyboard) order. @stable ICU 2.0 */	/** Direction indicator: the source is in logical (keyboard) order. @stable ICU 2.0 */
	#define U_SHAPE_TEXT_DIRECTION_LOGICAL 0	#define U_SHAPE_TEXT_DIRECTION_LOGICAL 0

	/**	/**
	* Direction indicator:	* Direction indicator:

		* the source is in visual RTL order,
		* the rightmost displayed character stored first.
		* This option is an alias to U_SHAPE_TEXT_DIRECTION_LOGICAL
		*/
		#define U_SHAPE_TEXT_DIRECTION_VISUAL_RTL 0

		/**
		* Direction indicator:
	* the source is in visual LTR order,	* the source is in visual LTR order,
	* the leftmost displayed character stored first.	* the leftmost displayed character stored first.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	#define U_SHAPE_TEXT_DIRECTION_VISUAL_LTR 4	#define U_SHAPE_TEXT_DIRECTION_VISUAL_LTR 4

	/** Bit mask for direction indicators. @stable ICU 2.0 */	/** Bit mask for direction indicators. @stable ICU 2.0 */
	#define U_SHAPE_TEXT_DIRECTION_MASK 4	#define U_SHAPE_TEXT_DIRECTION_MASK 4

	/** Letter shaping option: do not perform letter shaping. @stable ICU 2.0 * /	/** Letter shaping option: do not perform letter shaping. @stable ICU 2.0 * /

	skipping to change at line 168	skipping to change at line 225
	/**	/**
	* Letter shaping option: replace abstract letter characters by "shaped" on es.	* Letter shaping option: replace abstract letter characters by "shaped" on es.
	* The only difference with U_SHAPE_LETTERS_SHAPE is that Tashkeel letters	* The only difference with U_SHAPE_LETTERS_SHAPE is that Tashkeel letters
	* are always "shaped" into the isolated form instead of the medial form	* are always "shaped" into the isolated form instead of the medial form
	* (selecting code points from the Arabic Presentation Forms-B block).	* (selecting code points from the Arabic Presentation Forms-B block).
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	#define U_SHAPE_LETTERS_SHAPE_TASHKEEL_ISOLATED 0x18	#define U_SHAPE_LETTERS_SHAPE_TASHKEEL_ISOLATED 0x18

	/** Bit mask for letter shaping options. @stable ICU 2.0 */	/** Bit mask for letter shaping options. @stable ICU 2.0 */

	#define U_SHAPE_LETTERS_MASK 0x18	#define U_SHAPE_LETTERS_MASK 0x18

	/** Digit shaping option: do not perform digit shaping. @stable ICU 2.0 */	/** Digit shaping option: do not perform digit shaping. @stable ICU 2.0 */
	#define U_SHAPE_DIGITS_NOOP 0	#define U_SHAPE_DIGITS_NOOP 0

	/**	/**
	* Digit shaping option:	* Digit shaping option:
	* Replace European digits (U+0030...) by Arabic-Indic digits.	* Replace European digits (U+0030...) by Arabic-Indic digits.
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	#define U_SHAPE_DIGITS_EN2AN 0x20	#define U_SHAPE_DIGITS_EN2AN 0x20

	skipping to change at line 228	skipping to change at line 285
	/** Digit type option: Use Arabic-Indic digits (U+0660...U+0669). @stable I CU 2.0 */	/** Digit type option: Use Arabic-Indic digits (U+0660...U+0669). @stable I CU 2.0 */
	#define U_SHAPE_DIGIT_TYPE_AN 0	#define U_SHAPE_DIGIT_TYPE_AN 0

	/** Digit type option: Use Eastern (Extended) Arabic-Indic digits (U+06f0.. .U+06f9). @stable ICU 2.0 */	/** Digit type option: Use Eastern (Extended) Arabic-Indic digits (U+06f0.. .U+06f9). @stable ICU 2.0 */
	#define U_SHAPE_DIGIT_TYPE_AN_EXTENDED 0x100	#define U_SHAPE_DIGIT_TYPE_AN_EXTENDED 0x100

	/** Not a valid option value. May be replaced by a new option. @stable ICU 2.0 */	/** Not a valid option value. May be replaced by a new option. @stable ICU 2.0 */
	#define U_SHAPE_DIGIT_TYPE_RESERVED 0x200	#define U_SHAPE_DIGIT_TYPE_RESERVED 0x200

	/** Bit mask for digit type options. @stable ICU 2.0 */	/** Bit mask for digit type options. @stable ICU 2.0 */

	#define U_SHAPE_DIGIT_TYPE_MASK 0x3f00	#define U_SHAPE_DIGIT_TYPE_MASK 0x300 /* I need to change t his from 0x3f00 to 0x300 */

	/**	/**
	* Tashkeel aggregation option:	* Tashkeel aggregation option:
	* Replaces any combination of U+0651 with one of	* Replaces any combination of U+0651 with one of
	* U+064C, U+064D, U+064E, U+064F, U+0650 with	* U+064C, U+064D, U+064E, U+064F, U+0650 with
	* U+FC5E, U+FC5F, U+FC60, U+FC61, U+FC62 consecutively.	* U+FC5E, U+FC5F, U+FC60, U+FC61, U+FC62 consecutively.
	* @stable ICU 3.6	* @stable ICU 3.6
	*/	*/
	#define U_SHAPE_AGGREGATE_TASHKEEL 0x4000	#define U_SHAPE_AGGREGATE_TASHKEEL 0x4000
	/** Tashkeel aggregation option: do not aggregate tashkeels. @stable ICU 3. 6 */	/** Tashkeel aggregation option: do not aggregate tashkeels. @stable ICU 3. 6 */

	skipping to change at line 259	skipping to change at line 316
	#define U_SHAPE_PRESERVE_PRESENTATION 0x8000	#define U_SHAPE_PRESERVE_PRESENTATION 0x8000
	/** Presentation form option:	/** Presentation form option:
	* Replace Arabic Presentation Forms-A and Arabic Presentationo Forms-B wit h	* Replace Arabic Presentation Forms-A and Arabic Presentationo Forms-B wit h
	* their unshaped correspondants in range 0+06xx, before shaping.	* their unshaped correspondants in range 0+06xx, before shaping.
	* @stable ICU 3.6	* @stable ICU 3.6
	*/	*/
	#define U_SHAPE_PRESERVE_PRESENTATION_NOOP 0	#define U_SHAPE_PRESERVE_PRESENTATION_NOOP 0
	/** Bit mask for preserve presentation form. @stable ICU 3.6 */	/** Bit mask for preserve presentation form. @stable ICU 3.6 */
	#define U_SHAPE_PRESERVE_PRESENTATION_MASK 0x8000	#define U_SHAPE_PRESERVE_PRESENTATION_MASK 0x8000


		/* Seen Tail option */
		/**
		* Memory option: the result must have the same length as the source.
		* Shaping mode: The SEEN family character will expand into two characters
		using space near
		* the SEEN family character(i.e. the space after the charact
		er).
		* If there are no spaces found, an error U_NO_SPACE_AVAILABL
		E (as defined in utypes.h)
		* will be set in pErrorCode
		*
		* De-shaping mode: Any Seen character followed by Tail character will be
		* replaced by one cell Seen and a space will replace the
		Tail.
		* Affects: Seen options
		*/
		#define U_SHAPE_SEEN_TWOCELL_NEAR 0x200000

		/** Bit mask for Seen memory options. */
		#define U_SHAPE_SEEN_MASK 0x700000

		/* YehHamza option */
		/**
		* Memory option: the result must have the same length as the source.
		* Shaping mode: The YEHHAMZA character will expand into two characters usi
		ng space near it
		* (i.e. the space after the character
		* If there are no spaces found, an error U_NO_SPACE_AVAILABL
		E (as defined in utypes.h)
		* will be set in pErrorCode
		*
		* De-shaping mode: Any Yeh (final or isolated) character followed by Hamza
		character will be
		* replaced by one cell YehHamza and space will replace th
		e Hamza.
		* Affects: YehHamza options
		*/
		#define U_SHAPE_YEHHAMZA_TWOCELL_NEAR 0x1000000

		/** Bit mask for YehHamza memory options. */
		#define U_SHAPE_YEHHAMZA_MASK 0x3800000

		/* New Tashkeel options */
		/**
		* Memory option: the result must have the same length as the source.
		* Shaping mode: Tashkeel characters will be replaced by spaces.
		* Spaces will be placed at beginning of the buffer
		*
		* De-shaping mode: N/A
		* Affects: Tashkeel options
		*/
		#define U_SHAPE_TASHKEEL_BEGIN 0x40000

		/**
		* Memory option: the result must have the same length as the source.
		* Shaping mode: Tashkeel characters will be replaced by spaces.
		* Spaces will be placed at end of the buffer
		*
		* De-shaping mode: N/A
		* Affects: Tashkeel options
		*/
		#define U_SHAPE_TASHKEEL_END 0x60000

		/**
		* Memory option: allow the result to have a different length than the sour
		ce.
		* Shaping mode: Tashkeel characters will be removed, buffer length will sh
		rink.
		* De-shaping mode: N/A
		*
		* Affect: Tashkeel options
		*/
		#define U_SHAPE_TASHKEEL_RESIZE 0x80000

		/**
		* Memory option: the result must have the same length as the source.
		* Shaping mode: Tashkeel characters will be replaced by Tatweel if it is c
		onnected to adjacent
		* characters (i.e. shaped on Tatweel) or replaced by space i
		f it is not connected.
		*
		* De-shaping mode: N/A
		* Affects: YehHamza options
		*/
		#define U_SHAPE_TASHKEEL_REPLACE_BY_TATWEEL 0xC0000

		/** Bit mask for Tashkeel replacement with Space or Tatweel memory options.
		*/
		#define U_SHAPE_TASHKEEL_MASK 0xE0000

		/* Space location Control options */
		/**
		* This option affect the meaning of BEGIN and END options. if this option
		is not used the default
		* for BEGIN and END will be as following:
		* The Default (for both Visual LTR, Visual RTL and Logical Text)
		* 1. BEGIN always refers to the start address of physical memory
		.
		* 2. END always refers to the end address of physical memory.
		*
		* If this option is used it will swap the meaning of BEGIN and END only fo
		r Visual LTR text.
		*
		* The effect on BEGIN and END Memory Options will be as following:
		* A. BEGIN For Visual LTR text: This will be the beginning (right side)
		of the visual text(
		* corresponding to the physical memory address end for Visual LTR te
		xt, Same as END in
		* default behavior)
		* B. BEGIN For Logical text: Same as BEGIN in default behavior.
		* C. END For Visual LTR text: This will be the end (left side) of the v
		isual text (corresponding
		* to the physical memory address beginning for Visual LTR text, Same
		as BEGIN in default behavior.
		* D. END For Logical text: Same as END in default behavior).
		* Affects: All LamAlef BEGIN, END and AUTO options.
		*/
		#define U_SHAPE_SPACES_RELATIVE_TO_TEXT_BEGIN_END 0x4000000

		/** Bit mask for swapping BEGIN and END for Visual LTR text */
		#define U_SHAPE_SPACES_RELATIVE_TO_TEXT_MASK 0x4000000

		/**
		* If this option is used, shaping will use the new Unicode code point for
		TAIL (i.e. 0xFE73).
		* If this option is not specified (Default), old unofficial Unicode TAIL c
		ode point is used (i.e. 0x200B)
		* De-shaping will not use this option as it will always search for both th
		e new Unicode code point for the
		* TAIL (i.e. 0xFE73) or the old unofficial Unicode TAIL code point (i.e. 0
		x200B) and de-shape the
		* Seen-Family letter accordingly.
		*
		* Shaping Mode: Only shaping.
		* De-shaping Mode: N/A.
		* Affects: All Seen options
		*/
		#define SHAPE_TAIL_NEW_UNICODE 0x8000000

		/** Bit mask for new Unicode Tail option */
		#define SHAPE_TAIL_TYPE_MASK 0x8000000

	#endif	#endif

End of changes. 11 change blocks.
	4 lines changed or deleted	213 lines changed or added

	usprep.h	usprep.h

	skipping to change at line 110	skipping to change at line 110
	USPREP_RFC3530_NFS4_CS_PREP,	USPREP_RFC3530_NFS4_CS_PREP,
	/**	/**
	* RFC3530 nfs4_cs_prep with case insensitive option	* RFC3530 nfs4_cs_prep with case insensitive option
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	USPREP_RFC3530_NFS4_CS_PREP_CI,	USPREP_RFC3530_NFS4_CS_PREP_CI,
	/**	/**
	* RFC3530 nfs4_cis_prep	* RFC3530 nfs4_cis_prep
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/

	USPREP_RFC3530_NSF4_CIS_PREP,	USPREP_RFC3530_NFS4_CIS_PREP,
	/**	/**
	* RFC3530 nfs4_mixed_prep for prefix	* RFC3530 nfs4_mixed_prep for prefix
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/

	USPREP_RFC3530_NSF4_MIXED_PREP_PREFIX,	USPREP_RFC3530_NFS4_MIXED_PREP_PREFIX,
	/**	/**
	* RFC3530 nfs4_mixed_prep for suffix	* RFC3530 nfs4_mixed_prep for suffix
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/

	USPREP_RFC3530_NSF4_MIXED_PREP_SUFFIX,	USPREP_RFC3530_NFS4_MIXED_PREP_SUFFIX,
	/**	/**
	* RFC3722 iSCSI	* RFC3722 iSCSI
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	USPREP_RFC3722_ISCSI,	USPREP_RFC3722_ISCSI,
	/**	/**
	* RFC3920 XMPP Nodeprep	* RFC3920 XMPP Nodeprep
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	USPREP_RFC3920_NODEPREP,	USPREP_RFC3920_NODEPREP,

End of changes. 3 change blocks.
	3 lines changed or deleted	3 lines changed or added

	ustring.h	ustring.h
	/*	/*
	**********************************************************************	**********************************************************************

	* Copyright (C) 1998-2008, International Business Machines	* Copyright (C) 1998-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	**********************************************************************	**********************************************************************
	*	*
	* File ustring.h	* File ustring.h
	*	*
	* Modification History:	* Modification History:
	*	*
	* Date Name Description	* Date Name Description
	* 12/07/98 bertrand Creation.	* 12/07/98 bertrand Creation.
	************************************************************************* *	************************************************************************* *

	skipping to change at line 921	skipping to change at line 921
	* int32_t function() {	* int32_t function() {
	* if(!didInit) {	* if(!didInit) {
	* U_STRING_INIT(ustringVar1, "Quick-Fox 2", 11);	* U_STRING_INIT(ustringVar1, "Quick-Fox 2", 11);
	* U_STRING_INIT(ustringVar2, "jumps 5%", 8);	* U_STRING_INIT(ustringVar2, "jumps 5%", 8);
	* didInit=TRUE;	* didInit=TRUE;
	* }	* }
	* return u_strcmp(ustringVar1, ustringVar2);	* return u_strcmp(ustringVar1, ustringVar2);
	* }	* }
	* </pre>	* </pre>
	*	*

	* Note that the macros will NOT consistently work if their argument is ano	* Note that the macros will NOT consistently work if their argument is ano
	ther	ther #define.
	* #define. The following will not work on all platforms, don't use it.	* The following will not work on all platforms, don't use it.
	*	*
	* <pre>	* <pre>
	* #define GLUCK "Mr. Gluck"	* #define GLUCK "Mr. Gluck"
	* U_STRING_DECL(var, GLUCK, 9)	* U_STRING_DECL(var, GLUCK, 9)
	* U_STRING_INIT(var, GLUCK, 9)	* U_STRING_INIT(var, GLUCK, 9)
	* </pre>	* </pre>
	*	*
	* Instead, use the string literal "Mr. Gluck" as the argument to both mac ro	* Instead, use the string literal "Mr. Gluck" as the argument to both mac ro
	* calls.	* calls.
	*	*

	skipping to change at line 1186	skipping to change at line 1186
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE int32_t U_EXPORT2	U_STABLE int32_t U_EXPORT2
	u_strFoldCase(UChar *dest, int32_t destCapacity,	u_strFoldCase(UChar *dest, int32_t destCapacity,
	const UChar *src, int32_t srcLength,	const UChar *src, int32_t srcLength,
	uint32_t options,	uint32_t options,
	UErrorCode *pErrorCode);	UErrorCode *pErrorCode);

	#if defined(U_WCHAR_IS_UTF16) \|\| defined(U_WCHAR_IS_UTF32) \|\| !UCONFIG_NO_C ONVERSION	#if defined(U_WCHAR_IS_UTF16) \|\| defined(U_WCHAR_IS_UTF32) \|\| !UCONFIG_NO_C ONVERSION
	/**	/**

	* Converts a sequence of UChars to wchar_t units.	* Convert a UTF-16 string to a wchar_t string.
		* If it is known at compile time that wchar_t strings are in UTF-16 or UTF
		-32, then
		* this function simply calls the fast, dedicated function for that.
		* Otherwise, two conversions UTF-16 -> default charset -> wchar_t* are per
		formed.
	*	*
	* @param dest A buffer for the result string. The result will be zero-terminated if	* @param dest A buffer for the result string. The result will be zero-terminated if
	* the buffer is large enough.	* the buffer is large enough.
	* @param destCapacity The size of the buffer (number of wchar_t's). If it is 0, then	* @param destCapacity The size of the buffer (number of wchar_t's). If it is 0, then
	* dest may be NULL and the function will only return the length of the	* dest may be NULL and the function will only return the length of the
	* result without writing any of the result string (pr e-flighting).	* result without writing any of the result string (pr e-flighting).
	* @param pDestLength A pointer to receive the number of units written to the destination. If	* @param pDestLength A pointer to receive the number of units written to the destination. If
	* pDestLength!=NULL then *pDestLength is always set t o the	* pDestLength!=NULL then *pDestLength is always set t o the
	* number of output units corresponding to the transfo rmation of	* number of output units corresponding to the transfo rmation of
	* all the input units, even in case of a buffer overf low.	* all the input units, even in case of a buffer overf low.

	skipping to change at line 1212	skipping to change at line 1215
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE wchar_t* U_EXPORT2	U_STABLE wchar_t* U_EXPORT2
	u_strToWCS(wchar_t *dest,	u_strToWCS(wchar_t *dest,
	int32_t destCapacity,	int32_t destCapacity,
	int32_t *pDestLength,	int32_t *pDestLength,
	const UChar *src,	const UChar *src,
	int32_t srcLength,	int32_t srcLength,
	UErrorCode *pErrorCode);	UErrorCode *pErrorCode);
	/**	/**

	* Converts a sequence of wchar_t units to UChars	* Convert a wchar_t string to UTF-16.
		* If it is known at compile time that wchar_t strings are in UTF-16 or UTF
		-32, then
		* this function simply calls the fast, dedicated function for that.
		* Otherwise, two conversions wchar_t* -> default charset -> UTF-16 are per
		formed.
	*	*
	* @param dest A buffer for the result string. The result will be zero-terminated if	* @param dest A buffer for the result string. The result will be zero-terminated if
	* the buffer is large enough.	* the buffer is large enough.
	* @param destCapacity The size of the buffer (number of UChars). If it is 0, then	* @param destCapacity The size of the buffer (number of UChars). If it is 0, then
	* dest may be NULL and the function will only return the length of the	* dest may be NULL and the function will only return the length of the
	* result without writing any of the result string (pr e-flighting).	* result without writing any of the result string (pr e-flighting).
	* @param pDestLength A pointer to receive the number of units written to the destination. If	* @param pDestLength A pointer to receive the number of units written to the destination. If
	* pDestLength!=NULL then *pDestLength is always set t o the	* pDestLength!=NULL then *pDestLength is always set t o the
	* number of output units corresponding to the transfo rmation of	* number of output units corresponding to the transfo rmation of
	* all the input units, even in case of a buffer overf low.	* all the input units, even in case of a buffer overf low.

	skipping to change at line 1240	skipping to change at line 1246
	U_STABLE UChar* U_EXPORT2	U_STABLE UChar* U_EXPORT2
	u_strFromWCS(UChar *dest,	u_strFromWCS(UChar *dest,
	int32_t destCapacity,	int32_t destCapacity,
	int32_t *pDestLength,	int32_t *pDestLength,
	const wchar_t *src,	const wchar_t *src,
	int32_t srcLength,	int32_t srcLength,
	UErrorCode *pErrorCode);	UErrorCode *pErrorCode);
	#endif /* defined(U_WCHAR_IS_UTF16) \|\| defined(U_WCHAR_IS_UTF32) \|\| !UCONFI G_NO_CONVERSION */	#endif /* defined(U_WCHAR_IS_UTF16) \|\| defined(U_WCHAR_IS_UTF32) \|\| !UCONFI G_NO_CONVERSION */

	/**	/**

	* Converts a sequence of UChars (UTF-16) to UTF-8 bytes	* Convert a UTF-16 string to UTF-8.
		* If the input string is not well-formed, then the U_INVALID_CHAR_FOUND er
		ror code is set.
	*	*
	* @param dest A buffer for the result string. The result will be zero-terminated if	* @param dest A buffer for the result string. The result will be zero-terminated if
	* the buffer is large enough.	* the buffer is large enough.
	* @param destCapacity The size of the buffer (number of chars). If it is 0, then	* @param destCapacity The size of the buffer (number of chars). If it is 0, then
	* dest may be NULL and the function will only return the length of the	* dest may be NULL and the function will only return the length of the
	* result without writing any of the result string (pr e-flighting).	* result without writing any of the result string (pr e-flighting).
	* @param pDestLength A pointer to receive the number of units written to the destination. If	* @param pDestLength A pointer to receive the number of units written to the destination. If
	* pDestLength!=NULL then *pDestLength is always set t o the	* pDestLength!=NULL then *pDestLength is always set t o the
	* number of output units corresponding to the transfo rmation of	* number of output units corresponding to the transfo rmation of
	* all the input units, even in case of a buffer overf low.	* all the input units, even in case of a buffer overf low.

	skipping to change at line 1269	skipping to change at line 1276
	*/	*/
	U_STABLE char* U_EXPORT2	U_STABLE char* U_EXPORT2
	u_strToUTF8(char *dest,	u_strToUTF8(char *dest,
	int32_t destCapacity,	int32_t destCapacity,
	int32_t *pDestLength,	int32_t *pDestLength,
	const UChar *src,	const UChar *src,
	int32_t srcLength,	int32_t srcLength,
	UErrorCode *pErrorCode);	UErrorCode *pErrorCode);

	/**	/**

	* Converts a sequence of UTF-8 bytes to UChars (UTF-16).	* Convert a UTF-8 string to UTF-16.
		* If the input string is not well-formed, then the U_INVALID_CHAR_FOUND er
		ror code is set.
	*	*
	* @param dest A buffer for the result string. The result will be zero-terminated if	* @param dest A buffer for the result string. The result will be zero-terminated if
	* the buffer is large enough.	* the buffer is large enough.
	* @param destCapacity The size of the buffer (number of UChars). If it is 0, then	* @param destCapacity The size of the buffer (number of UChars). If it is 0, then
	* dest may be NULL and the function will only return the length of the	* dest may be NULL and the function will only return the length of the
	* result without writing any of the result string (pr e-flighting).	* result without writing any of the result string (pr e-flighting).
	* @param pDestLength A pointer to receive the number of units written to the destination. If	* @param pDestLength A pointer to receive the number of units written to the destination. If
	* pDestLength!=NULL then *pDestLength is always set t o the	* pDestLength!=NULL then *pDestLength is always set t o the
	* number of output units corresponding to the transfo rmation of	* number of output units corresponding to the transfo rmation of
	* all the input units, even in case of a buffer overf low.	* all the input units, even in case of a buffer overf low.

	skipping to change at line 1298	skipping to change at line 1306
	*/	*/
	U_STABLE UChar* U_EXPORT2	U_STABLE UChar* U_EXPORT2
	u_strFromUTF8(UChar *dest,	u_strFromUTF8(UChar *dest,
	int32_t destCapacity,	int32_t destCapacity,
	int32_t *pDestLength,	int32_t *pDestLength,
	const char *src,	const char *src,
	int32_t srcLength,	int32_t srcLength,
	UErrorCode *pErrorCode);	UErrorCode *pErrorCode);

	/**	/**

	* Converts a sequence of UChars (UTF-16) to UTF-8 bytes.	* Convert a UTF-16 string to UTF-8.
		* If the input string is not well-formed, then the U_INVALID_CHAR_FOUND er
		ror code is set.
		*
	* Same as u_strToUTF8() except for the additional subchar which is output for	* Same as u_strToUTF8() except for the additional subchar which is output for
	* illegal input sequences, instead of stopping with the U_INVALID_CHAR_FOU ND error code.	* illegal input sequences, instead of stopping with the U_INVALID_CHAR_FOU ND error code.
	* With subchar==U_SENTINEL, this function behaves exactly like u_strToUTF8 ().	* With subchar==U_SENTINEL, this function behaves exactly like u_strToUTF8 ().
	*	*
	* @param dest A buffer for the result string. The result will be zero-terminated if	* @param dest A buffer for the result string. The result will be zero-terminated if
	* the buffer is large enough.	* the buffer is large enough.
	* @param destCapacity The size of the buffer (number of chars). If it is 0, then	* @param destCapacity The size of the buffer (number of chars). If it is 0, then
	* dest may be NULL and the function will only return the length of the	* dest may be NULL and the function will only return the length of the
	* result without writing any of the result string (pr e-flighting).	* result without writing any of the result string (pr e-flighting).
	* @param pDestLength A pointer to receive the number of units written to the destination. If	* @param pDestLength A pointer to receive the number of units written to the destination. If

	skipping to change at line 1341	skipping to change at line 1351
	U_STABLE char* U_EXPORT2	U_STABLE char* U_EXPORT2
	u_strToUTF8WithSub(char *dest,	u_strToUTF8WithSub(char *dest,
	int32_t destCapacity,	int32_t destCapacity,
	int32_t *pDestLength,	int32_t *pDestLength,
	const UChar *src,	const UChar *src,
	int32_t srcLength,	int32_t srcLength,
	UChar32 subchar, int32_t *pNumSubstitutions,	UChar32 subchar, int32_t *pNumSubstitutions,
	UErrorCode *pErrorCode);	UErrorCode *pErrorCode);

	/**	/**

	* Converts a sequence of UTF-8 bytes to UChars (UTF-16).	* Convert a UTF-8 string to UTF-16.
		* If the input string is not well-formed, then the U_INVALID_CHAR_FOUND er
		ror code is set.
		*
	* Same as u_strFromUTF8() except for the additional subchar which is outpu t for	* Same as u_strFromUTF8() except for the additional subchar which is outpu t for
	* illegal input sequences, instead of stopping with the U_INVALID_CHAR_FOU ND error code.	* illegal input sequences, instead of stopping with the U_INVALID_CHAR_FOU ND error code.
	* With subchar==U_SENTINEL, this function behaves exactly like u_strFromUT F8().	* With subchar==U_SENTINEL, this function behaves exactly like u_strFromUT F8().
	*	*
	* @param dest A buffer for the result string. The result will be zero-terminated if	* @param dest A buffer for the result string. The result will be zero-terminated if
	* the buffer is large enough.	* the buffer is large enough.
	* @param destCapacity The size of the buffer (number of UChars). If it is 0, then	* @param destCapacity The size of the buffer (number of UChars). If it is 0, then
	* dest may be NULL and the function will only return the length of the	* dest may be NULL and the function will only return the length of the
	* result without writing any of the result string (pr e-flighting).	* result without writing any of the result string (pr e-flighting).
	* @param pDestLength A pointer to receive the number of units written to the destination. If	* @param pDestLength A pointer to receive the number of units written to the destination. If

	skipping to change at line 1385	skipping to change at line 1397
	U_STABLE UChar* U_EXPORT2	U_STABLE UChar* U_EXPORT2
	u_strFromUTF8WithSub(UChar *dest,	u_strFromUTF8WithSub(UChar *dest,
	int32_t destCapacity,	int32_t destCapacity,
	int32_t *pDestLength,	int32_t *pDestLength,
	const char *src,	const char *src,
	int32_t srcLength,	int32_t srcLength,
	UChar32 subchar, int32_t *pNumSubstitutions,	UChar32 subchar, int32_t *pNumSubstitutions,
	UErrorCode *pErrorCode);	UErrorCode *pErrorCode);

	/**	/**

	* Converts a sequence of UTF-8 bytes to UChars (UTF-16).	* Convert a UTF-8 string to UTF-16.
		*
	* Same as u_strFromUTF8() except that this function is designed to be very fast,	* Same as u_strFromUTF8() except that this function is designed to be very fast,
	* which it achieves by being lenient about malformed UTF-8 sequences.	* which it achieves by being lenient about malformed UTF-8 sequences.
	* This function is intended for use in environments where UTF-8 text is	* This function is intended for use in environments where UTF-8 text is
	* expected to be well-formed.	* expected to be well-formed.
	*	*
	* Its semantics are:	* Its semantics are:
	* - Well-formed UTF-8 text is correctly converted to well-formed UTF-16 te xt.	* - Well-formed UTF-8 text is correctly converted to well-formed UTF-16 te xt.
	* - The function will not read beyond the input string, nor write beyond	* - The function will not read beyond the input string, nor write beyond
	* the destCapacity.	* the destCapacity.
	* - Malformed UTF-8 results in "garbage" 16-bit Unicode strings which may not	* - Malformed UTF-8 results in "garbage" 16-bit Unicode strings which may not
	* be well-formed UTF-16.	* be well-formed UTF-16.
	* The function will resynchronize to valid code point boundaries	* The function will resynchronize to valid code point boundaries
	* within a small number of code points after an illegal sequence.	* within a small number of code points after an illegal sequence.
	* - Non-shortest forms are not detected and will result in "spoofing" outp ut.	* - Non-shortest forms are not detected and will result in "spoofing" outp ut.
	*	*
	* For further performance improvement, if srcLength is given (>=0),	* For further performance improvement, if srcLength is given (>=0),
	* then it must be destCapacity>=srcLength.	* then it must be destCapacity>=srcLength.
	*	*

		* There is no inverse u_strToUTF8Lenient() function because there is pract
		ically
		* no performance gain from not checking that a UTF-16 string is well-forme
		d.
		*
	* @param dest A buffer for the result string. The result will be zero-terminated if	* @param dest A buffer for the result string. The result will be zero-terminated if
	* the buffer is large enough.	* the buffer is large enough.
	* @param destCapacity The size of the buffer (number of UChars). If it is 0, then	* @param destCapacity The size of the buffer (number of UChars). If it is 0, then
	* dest may be NULL and the function will only return the length of the	* dest may be NULL and the function will only return the length of the
	* result without writing any of the result string (pr e-flighting).	* result without writing any of the result string (pr e-flighting).
	* Unlike for other ICU functions, if srcLength>=0 the n it	* Unlike for other ICU functions, if srcLength>=0 the n it
	* must be destCapacity>=srcLength.	* must be destCapacity>=srcLength.
	* @param pDestLength A pointer to receive the number of units written to the destination. If	* @param pDestLength A pointer to receive the number of units written to the destination. If
	* pDestLength!=NULL then *pDestLength is always set t o the	* pDestLength!=NULL then *pDestLength is always set t o the
	* number of output units corresponding to the transfo rmation of	* number of output units corresponding to the transfo rmation of

	skipping to change at line 1440	skipping to change at line 1456
	*/	*/
	U_STABLE UChar * U_EXPORT2	U_STABLE UChar * U_EXPORT2
	u_strFromUTF8Lenient(UChar *dest,	u_strFromUTF8Lenient(UChar *dest,
	int32_t destCapacity,	int32_t destCapacity,
	int32_t *pDestLength,	int32_t *pDestLength,
	const char *src,	const char *src,
	int32_t srcLength,	int32_t srcLength,
	UErrorCode *pErrorCode);	UErrorCode *pErrorCode);

	/**	/**

	* Converts a sequence of UChars (UTF-16) to UTF32 units.	* Convert a UTF-16 string to UTF-32.
		* If the input string is not well-formed, then the U_INVALID_CHAR_FOUND er
		ror code is set.
	*	*
	* @param dest A buffer for the result string. The result will be zero-terminated if	* @param dest A buffer for the result string. The result will be zero-terminated if
	* the buffer is large enough.	* the buffer is large enough.
	* @param destCapacity The size of the buffer (number of UChar32s). If it is 0, then	* @param destCapacity The size of the buffer (number of UChar32s). If it is 0, then
	* dest may be NULL and the function will only return the length of the	* dest may be NULL and the function will only return the length of the
	* result without writing any of the result string (pr e-flighting).	* result without writing any of the result string (pr e-flighting).
	* @param pDestLength A pointer to receive the number of units written to the destination. If	* @param pDestLength A pointer to receive the number of units written to the destination. If
	* pDestLength!=NULL then *pDestLength is always set t o the	* pDestLength!=NULL then *pDestLength is always set t o the
	* number of output units corresponding to the transfo rmation of	* number of output units corresponding to the transfo rmation of
	* all the input units, even in case of a buffer overf low.	* all the input units, even in case of a buffer overf low.
	* @param src The original source string	* @param src The original source string
	* @param srcLength The length of the original string. If -1, then src must be zero-terminated.	* @param srcLength The length of the original string. If -1, then src must be zero-terminated.
	* @param pErrorCode Must be a valid pointer to an error code value,	* @param pErrorCode Must be a valid pointer to an error code value,
	* which must not indicate a failure before the functi on call.	* which must not indicate a failure before the functi on call.
	* @return The pointer to destination buffer.	* @return The pointer to destination buffer.

		* @see u_strToUTF32WithSub
		* @see u_strFromUTF32
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE UChar32* U_EXPORT2	U_STABLE UChar32* U_EXPORT2
	u_strToUTF32(UChar32 *dest,	u_strToUTF32(UChar32 *dest,
	int32_t destCapacity,	int32_t destCapacity,
	int32_t *pDestLength,	int32_t *pDestLength,
	const UChar *src,	const UChar *src,
	int32_t srcLength,	int32_t srcLength,
	UErrorCode *pErrorCode);	UErrorCode *pErrorCode);

	/**	/**

	* Converts a sequence of UTF32 units to UChars (UTF-16)	* Convert a UTF-32 string to UTF-16.
		* If the input string is not well-formed, then the U_INVALID_CHAR_FOUND er
		ror code is set.
	*	*
	* @param dest A buffer for the result string. The result will be zero-terminated if	* @param dest A buffer for the result string. The result will be zero-terminated if
	* the buffer is large enough.	* the buffer is large enough.
	* @param destCapacity The size of the buffer (number of UChars). If it is 0, then	* @param destCapacity The size of the buffer (number of UChars). If it is 0, then
	* dest may be NULL and the function will only return the length of the	* dest may be NULL and the function will only return the length of the
	* result without writing any of the result string (pr e-flighting).	* result without writing any of the result string (pr e-flighting).
	* @param pDestLength A pointer to receive the number of units written to the destination. If	* @param pDestLength A pointer to receive the number of units written to the destination. If
	* pDestLength!=NULL then *pDestLength is always set t o the	* pDestLength!=NULL then *pDestLength is always set t o the
	* number of output units corresponding to the transfo rmation of	* number of output units corresponding to the transfo rmation of
	* all the input units, even in case of a buffer overf low.	* all the input units, even in case of a buffer overf low.
	* @param src The original source string	* @param src The original source string
	* @param srcLength The length of the original string. If -1, then src must be zero-terminated.	* @param srcLength The length of the original string. If -1, then src must be zero-terminated.
	* @param pErrorCode Must be a valid pointer to an error code value,	* @param pErrorCode Must be a valid pointer to an error code value,
	* which must not indicate a failure before the functi on call.	* which must not indicate a failure before the functi on call.
	* @return The pointer to destination buffer.	* @return The pointer to destination buffer.

		* @see u_strFromUTF32WithSub
		* @see u_strToUTF32
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/
	U_STABLE UChar* U_EXPORT2	U_STABLE UChar* U_EXPORT2
	u_strFromUTF32(UChar *dest,	u_strFromUTF32(UChar *dest,
	int32_t destCapacity,	int32_t destCapacity,
	int32_t *pDestLength,	int32_t *pDestLength,
	const UChar32 *src,	const UChar32 *src,
	int32_t srcLength,	int32_t srcLength,
	UErrorCode *pErrorCode);	UErrorCode *pErrorCode);


		/**
		* Convert a UTF-16 string to UTF-32.
		* If the input string is not well-formed, then the U_INVALID_CHAR_FOUND er
		ror code is set.
		*
		* Same as u_strToUTF32() except for the additional subchar which is output
		for
		* illegal input sequences, instead of stopping with the U_INVALID_CHAR_FOU
		ND error code.
		* With subchar==U_SENTINEL, this function behaves exactly like u_strToUTF3
		2().
		*
		* @param dest A buffer for the result string. The result will be
		zero-terminated if
		* the buffer is large enough.
		* @param destCapacity The size of the buffer (number of UChar32s). If it
		is 0, then
		* dest may be NULL and the function will only return
		the length of the
		* result without writing any of the result string (pr
		e-flighting).
		* @param pDestLength A pointer to receive the number of units written to
		the destination. If
		* pDestLength!=NULL then *pDestLength is always set t
		o the
		* number of output units corresponding to the transfo
		rmation of
		* all the input units, even in case of a buffer overf
		low.
		* @param src The original source string
		* @param srcLength The length of the original string. If -1, then src
		must be zero-terminated.
		* @param subchar The substitution character to use in place of an il
		legal input sequence,
		* or U_SENTINEL if the function is to return with U_I
		NVALID_CHAR_FOUND instead.
		* A substitution character can be any valid Unicode c
		ode point (up to U+10FFFF)
		* except for surrogate code points (U+D800..U+DFFF).
		* The recommended value is U+FFFD "REPLACEMENT CHARAC
		TER".
		* @param pNumSubstitutions Output parameter receiving the number of substi
		tutions if subchar>=0.
		* Set to 0 if no substitutions occur or subchar<0.
		* pNumSubstitutions can be NULL.
		* @param pErrorCode Pointer to a standard ICU error code. Its input val
		ue must
		* pass the U_SUCCESS() test, or else the function ret
		urns
		* immediately. Check for U_FAILURE() on output or use
		with
		* function chaining. (See User Guide for details.)
		* @return The pointer to destination buffer.
		* @see u_strToUTF32
		* @see u_strFromUTF32WithSub
		* @draft ICU 4.2
		*/
		U_DRAFT UChar32* U_EXPORT2
		u_strToUTF32WithSub(UChar32 *dest,
		int32_t destCapacity,
		int32_t *pDestLength,
		const UChar *src,
		int32_t srcLength,
		UChar32 subchar, int32_t *pNumSubstitutions,
		UErrorCode *pErrorCode);

		/**
		* Convert a UTF-32 string to UTF-16.
		* If the input string is not well-formed, then the U_INVALID_CHAR_FOUND er
		ror code is set.
		*
		* Same as u_strFromUTF32() except for the additional subchar which is outp
		ut for
		* illegal input sequences, instead of stopping with the U_INVALID_CHAR_FOU
		ND error code.
		* With subchar==U_SENTINEL, this function behaves exactly like u_strFromUT
		F32().
		*
		* @param dest A buffer for the result string. The result will be
		zero-terminated if
		* the buffer is large enough.
		* @param destCapacity The size of the buffer (number of UChars). If it is
		0, then
		* dest may be NULL and the function will only return
		the length of the
		* result without writing any of the result string (pr
		e-flighting).
		* @param pDestLength A pointer to receive the number of units written to
		the destination. If
		* pDestLength!=NULL then *pDestLength is always set t
		o the
		* number of output units corresponding to the transfo
		rmation of
		* all the input units, even in case of a buffer overf
		low.
		* @param src The original source string
		* @param srcLength The length of the original string. If -1, then src
		must be zero-terminated.
		* @param subchar The substitution character to use in place of an il
		legal input sequence,
		* or U_SENTINEL if the function is to return with U_I
		NVALID_CHAR_FOUND instead.
		* A substitution character can be any valid Unicode c
		ode point (up to U+10FFFF)
		* except for surrogate code points (U+D800..U+DFFF).
		* The recommended value is U+FFFD "REPLACEMENT CHARAC
		TER".
		* @param pNumSubstitutions Output parameter receiving the number of substi
		tutions if subchar>=0.
		* Set to 0 if no substitutions occur or subchar<0.
		* pNumSubstitutions can be NULL.
		* @param pErrorCode Pointer to a standard ICU error code. Its input val
		ue must
		* pass the U_SUCCESS() test, or else the function ret
		urns
		* immediately. Check for U_FAILURE() on output or use
		with
		* function chaining. (See User Guide for details.)
		* @return The pointer to destination buffer.
		* @see u_strFromUTF32
		* @see u_strToUTF32WithSub
		* @draft ICU 4.2
		*/
		U_DRAFT UChar* U_EXPORT2
		u_strFromUTF32WithSub(UChar *dest,
		int32_t destCapacity,
		int32_t *pDestLength,
		const UChar32 *src,
		int32_t srcLength,
		UChar32 subchar, int32_t *pNumSubstitutions,
		UErrorCode *pErrorCode);

	#endif	#endif

End of changes. 15 change blocks.
	13 lines changed or deleted	179 lines changed or added

	usystem.h	usystem.h

	skipping to change at line 35	skipping to change at line 35

	# if U_DISABLE_RENAMING	# if U_DISABLE_RENAMING
	# define u_cleanup u_cleanup_SYSTEM_API_DO_NOT_USE	# define u_cleanup u_cleanup_SYSTEM_API_DO_NOT_USE
	# define u_setAtomicIncDecFunctions u_setAtomicIncDecFunctions_SYSTE M_API_DO_NOT_USE	# define u_setAtomicIncDecFunctions u_setAtomicIncDecFunctions_SYSTE M_API_DO_NOT_USE
	# define u_setMemoryFunctions u_setMemoryFunctions_SYSTEM_API_DO_NOT _USE	# define u_setMemoryFunctions u_setMemoryFunctions_SYSTEM_API_DO_NOT _USE
	# define u_setMutexFunctions u_setMutexFunctions_SYSTEM_API_DO_NOT_U SE	# define u_setMutexFunctions u_setMutexFunctions_SYSTEM_API_DO_NOT_U SE
	# define ucnv_setDefaultName ucnv_setDefaultName_SYSTEM_API_DO_NOT_U SE	# define ucnv_setDefaultName ucnv_setDefaultName_SYSTEM_API_DO_NOT_U SE
	# define uloc_getDefault uloc_getDefault_SYSTEM_API_DO_NOT_USE	# define uloc_getDefault uloc_getDefault_SYSTEM_API_DO_NOT_USE
	# define uloc_setDefault uloc_setDefault_SYSTEM_API_DO_NOT_USE	# define uloc_setDefault uloc_setDefault_SYSTEM_API_DO_NOT_USE
	# else	# else

	# define u_cleanup_4_1.2 u_cleanup_SYSTEM_API_DO_NOT_USE	# define u_cleanup_4_2 u_cleanup_SYSTEM_API_DO_NOT_USE
	# define u_setAtomicIncDecFunctions_4_1.2 u_setAtomicIncDecFunctions	# define u_setAtomicIncDecFunctions_4_2 u_setAtomicIncDecFunctions_S
	_SYSTEM_API_DO_NOT_USE	YSTEM_API_DO_NOT_USE
	# define u_setMemoryFunctions_4_1.2 u_setMemoryFunctions_SYSTEM_API_	# define u_setMemoryFunctions_4_2 u_setMemoryFunctions_SYSTEM_API_DO
	DO_NOT_USE	_NOT_USE
	# define u_setMutexFunctions_4_1.2 u_setMutexFunctions_SYSTEM_API_DO	# define u_setMutexFunctions_4_2 u_setMutexFunctions_SYSTEM_API_DO_N
	_NOT_USE	OT_USE
	# define ucnv_setDefaultName_4_1.2 ucnv_setDefaultName_SYSTEM_API_DO	# define ucnv_setDefaultName_4_2 ucnv_setDefaultName_SYSTEM_API_DO_N
	_NOT_USE	OT_USE
	# define uloc_getDefault_4_1.2 uloc_getDefault_SYSTEM_API_DO_NOT_USE	# define uloc_getDefault_4_2 uloc_getDefault_SYSTEM_API_DO_NOT_USE
	# define uloc_setDefault_4_1.2 uloc_setDefault_SYSTEM_API_DO_NOT_USE	# define uloc_setDefault_4_2 uloc_setDefault_SYSTEM_API_DO_NOT_USE
	# endif /* U_DISABLE_RENAMING */	# endif /* U_DISABLE_RENAMING */

	#endif /* U_HIDE_SYSTEM_API */	#endif /* U_HIDE_SYSTEM_API */
	#endif /* USYSTEM_H */	#endif /* USYSTEM_H */

End of changes. 1 change blocks.
	11 lines changed or deleted	11 lines changed or added

	utypes.h	utypes.h
	/*	/*
	**********************************************************************	**********************************************************************

	* Copyright (C) 1996-2008, International Business Machines	* Copyright (C) 1996-2009, International Business Machines
	* Corporation and others. All Rights Reserved.	* Corporation and others. All Rights Reserved.
	**********************************************************************	**********************************************************************
	*	*
	* FILE NAME : UTYPES.H (formerly ptypes.h)	* FILE NAME : UTYPES.H (formerly ptypes.h)
	*	*
	* Date Name Description	* Date Name Description
	* 12/11/96 helena Creation.	* 12/11/96 helena Creation.
	* 02/27/97 aliu Added typedefs for UClassID, int8, int16, int32 ,	* 02/27/97 aliu Added typedefs for UClassID, int8, int16, int32 ,
	* uint8, uint16, and uint32.	* uint8, uint16, and uint32.
	* 04/01/97 aliu Added XP_CPLUSPLUS and modified to work under C as	* 04/01/97 aliu Added XP_CPLUSPLUS and modified to work under C as

	skipping to change at line 141	skipping to change at line 141
	* '@' <commercial at>	* '@' <commercial at>
	* '`' <grave accent>	* '`' <grave accent>
	* \endcode	* \endcode
	* @stable ICU 2.0	* @stable ICU 2.0
	*/	*/

	#ifndef U_CHARSET_FAMILY	#ifndef U_CHARSET_FAMILY
	# define U_CHARSET_FAMILY 0	# define U_CHARSET_FAMILY 0
	#endif	#endif


		/**
		* \def U_CHARSET_IS_UTF8
		*
		* Hardcode the default charset to UTF-8.
		*
		* If this is set to 1, then
		* - ICU will assume that all non-invariant char*, StringPiece, std::string
		etc.
		* contain UTF-8 text, regardless of what the system API uses
		* - some ICU code will use fast functions like u_strFromUTF8()
		* rather than the more general and more heavy-weight conversion API (ucn
		v.h)
		* - ucnv_getDefaultName() always returns "UTF-8"
		* - ucnv_setDefaultName() is disabled and will not change the default char
		set
		* - static builds of ICU are smaller
		* - more functionality is available with the UCONFIG_NO_CONVERSION build-t
		ime
		* configuration option (see unicode/uconfig.h)
		* - the UCONFIG_NO_CONVERSION build option in uconfig.h is more usable
		*
		* @draft ICU 4.2
		* @see UCONFIG_NO_CONVERSION
		*/
		#ifndef U_CHARSET_IS_UTF8
		# define U_CHARSET_IS_UTF8 0
		#endif

	/========================================================================= ==/	/========================================================================= ==/
	/* ICUDATA naming scheme */	/* ICUDATA naming scheme */
	/========================================================================= ==/	/========================================================================= ==/

	/**	/**
	* \def U_ICUDATA_TYPE_LETTER	* \def U_ICUDATA_TYPE_LETTER
	*	*
	* This is a platform-dependent string containing one letter:	* This is a platform-dependent string containing one letter:
	* - b for big-endian, ASCII-family platforms	* - b for big-endian, ASCII-family platforms
	* - l for little-endian, ASCII-family platforms	* - l for little-endian, ASCII-family platforms

End of changes. 2 change blocks.
	1 lines changed or deleted	29 lines changed or added

	uversion.h	uversion.h

	skipping to change at line 71	skipping to change at line 71
	/** The current ICU major version as an integer.	/** The current ICU major version as an integer.
	* This value will change in the subsequent releases of ICU	* This value will change in the subsequent releases of ICU
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	#define U_ICU_VERSION_MAJOR_NUM 4	#define U_ICU_VERSION_MAJOR_NUM 4

	/** The current ICU minor version as an integer.	/** The current ICU minor version as an integer.
	* This value will change in the subsequent releases of ICU	* This value will change in the subsequent releases of ICU
	* @stable ICU 2.6	* @stable ICU 2.6
	*/	*/

	#define U_ICU_VERSION_MINOR_NUM 1	#define U_ICU_VERSION_MINOR_NUM 2

	/** The current ICU patchlevel version as an integer.	/** The current ICU patchlevel version as an integer.
	* This value will change in the subsequent releases of ICU	* This value will change in the subsequent releases of ICU
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/

	#define U_ICU_VERSION_PATCHLEVEL_NUM 3	#define U_ICU_VERSION_PATCHLEVEL_NUM 0

	/** The current ICU build level version as an integer.	/** The current ICU build level version as an integer.
	* This value is for use by ICU clients. It defaults to 0.	* This value is for use by ICU clients. It defaults to 0.

	* @draft ICU 4.0	* @stable ICU 4.0
	*/	*/
	#ifndef U_ICU_VERSION_BUILDLEVEL_NUM	#ifndef U_ICU_VERSION_BUILDLEVEL_NUM
	#define U_ICU_VERSION_BUILDLEVEL_NUM 0	#define U_ICU_VERSION_BUILDLEVEL_NUM 0
	#endif	#endif

	/** Glued version suffix for renamers	/** Glued version suffix for renamers
	* This value will change in the subsequent releases of ICU	* This value will change in the subsequent releases of ICU
	* @stable ICU 2.6	* @stable ICU 2.6
	*/	*/

	#define U_ICU_VERSION_SUFFIX _4_1	#define U_ICU_VERSION_SUFFIX _4_2

	/** The current ICU library version as a dotted-decimal string. The patchle vel	/** The current ICU library version as a dotted-decimal string. The patchle vel
	* only appears in this string if it non-zero.	* only appears in this string if it non-zero.
	* This value will change in the subsequent releases of ICU	* This value will change in the subsequent releases of ICU
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/

	#define U_ICU_VERSION "4.1.3"	#define U_ICU_VERSION "4.2"

	/** The current ICU library major/minor version as a string without dots, f or library name suffixes.	/** The current ICU library major/minor version as a string without dots, f or library name suffixes.
	* This value will change in the subsequent releases of ICU	* This value will change in the subsequent releases of ICU
	* @stable ICU 2.6	* @stable ICU 2.6
	*/	*/

	#define U_ICU_VERSION_SHORT "41"	#define U_ICU_VERSION_SHORT "42"

	/** An ICU version consists of up to 4 numbers from 0..255.	/** An ICU version consists of up to 4 numbers from 0..255.
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	#define U_MAX_VERSION_LENGTH 4	#define U_MAX_VERSION_LENGTH 4

	/** In a string, ICU version fields are delimited by dots.	/** In a string, ICU version fields are delimited by dots.
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/
	#define U_VERSION_DELIMITER '.'	#define U_VERSION_DELIMITER '.'

	skipping to change at line 166	skipping to change at line 166
	* If the compiler doesn't support namespaces, this does nothing.	* If the compiler doesn't support namespaces, this does nothing.
	* @stable ICU 2.4	* @stable ICU 2.4
	*/	*/

	/* Define namespace symbols if the compiler supports it. */	/* Define namespace symbols if the compiler supports it. */
	#if U_HAVE_NAMESPACE && defined(XP_CPLUSPLUS)	#if U_HAVE_NAMESPACE && defined(XP_CPLUSPLUS)
	# if U_DISABLE_RENAMING	# if U_DISABLE_RENAMING
	# define U_ICU_NAMESPACE icu	# define U_ICU_NAMESPACE icu
	namespace U_ICU_NAMESPACE { }	namespace U_ICU_NAMESPACE { }
	# else	# else

	# define U_ICU_NAMESPACE icu_4_1	# define U_ICU_NAMESPACE icu_4_2
	namespace U_ICU_NAMESPACE { }	namespace U_ICU_NAMESPACE { }
	namespace icu = U_ICU_NAMESPACE;	namespace icu = U_ICU_NAMESPACE;
	# endif	# endif

	# define U_NAMESPACE_BEGIN namespace U_ICU_NAMESPACE {	# define U_NAMESPACE_BEGIN namespace U_ICU_NAMESPACE {
	# define U_NAMESPACE_END }	# define U_NAMESPACE_END }
	# define U_NAMESPACE_USE using namespace U_ICU_NAMESPACE;	# define U_NAMESPACE_USE using namespace U_ICU_NAMESPACE;
	# define U_NAMESPACE_QUALIFIER U_ICU_NAMESPACE::	# define U_NAMESPACE_QUALIFIER U_ICU_NAMESPACE::

	# ifndef U_USING_ICU_NAMESPACE	# ifndef U_USING_ICU_NAMESPACE

End of changes. 7 change blocks.
	7 lines changed or deleted	7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	LETypes.h	LETypes.h
	/*	/*
	*	*

	* (C) Copyright IBM Corp. 1998-2007 - All Rights Reserved	* (C) Copyright IBM Corp. 1998-2009 - All Rights Reserved
	*	*
	*/	*/

	#ifndef __LETYPES_H	#ifndef __LETYPES_H
	#define __LETYPES_H	#define __LETYPES_H

	#if !defined(LE_USE_CMEMORY) && (defined(U_LAYOUT_IMPLEMENTATION) \|\| define d(U_LAYOUTEX_IMPLEMENTATION) \|\| defined(U_STATIC_IMPLEMENTATION) \|\| defined (U_COMBINED_IMPLEMENTATION))	#if !defined(LE_USE_CMEMORY) && (defined(U_LAYOUT_IMPLEMENTATION) \|\| define d(U_LAYOUTEX_IMPLEMENTATION) \|\| defined(U_STATIC_IMPLEMENTATION) \|\| defined (U_COMBINED_IMPLEMENTATION))
	#define LE_USE_CMEMORY	#define LE_USE_CMEMORY
	#endif	#endif


	skipping to change at line 401	skipping to change at line 401
	LE_ABVM_FEATURE_TAG = 0x6162766DUL, /*< 'abvm' /	LE_ABVM_FEATURE_TAG = 0x6162766DUL, /*< 'abvm' /
	LE_ABVS_FEATURE_TAG = 0x61627673UL, /*< 'abvs' /	LE_ABVS_FEATURE_TAG = 0x61627673UL, /*< 'abvs' /
	LE_AFRC_FEATURE_TAG = 0x61667263UL, /*< 'afrc' /	LE_AFRC_FEATURE_TAG = 0x61667263UL, /*< 'afrc' /
	LE_AKHN_FEATURE_TAG = 0x616B686EUL, /*< 'akhn' /	LE_AKHN_FEATURE_TAG = 0x616B686EUL, /*< 'akhn' /
	LE_BLWF_FEATURE_TAG = 0x626C7766UL, /*< 'blwf' /	LE_BLWF_FEATURE_TAG = 0x626C7766UL, /*< 'blwf' /
	LE_BLWM_FEATURE_TAG = 0x626C776DUL, /*< 'blwm' /	LE_BLWM_FEATURE_TAG = 0x626C776DUL, /*< 'blwm' /
	LE_BLWS_FEATURE_TAG = 0x626C7773UL, /*< 'blws' /	LE_BLWS_FEATURE_TAG = 0x626C7773UL, /*< 'blws' /
	LE_CALT_FEATURE_TAG = 0x63616C74UL, /*< 'calt' /	LE_CALT_FEATURE_TAG = 0x63616C74UL, /*< 'calt' /
	LE_CASE_FEATURE_TAG = 0x63617365UL, /*< 'case' /	LE_CASE_FEATURE_TAG = 0x63617365UL, /*< 'case' /
	LE_CCMP_FEATURE_TAG = 0x63636D70UL, /*< 'ccmp' /	LE_CCMP_FEATURE_TAG = 0x63636D70UL, /*< 'ccmp' /

		LE_CJCT_FEATURE_TAG = 0x636A6374UL, /*< 'cjct' /
	LE_CLIG_FEATURE_TAG = 0x636C6967UL, /*< 'clig' /	LE_CLIG_FEATURE_TAG = 0x636C6967UL, /*< 'clig' /
	LE_CPSP_FEATURE_TAG = 0x63707370UL, /*< 'cpsp' /	LE_CPSP_FEATURE_TAG = 0x63707370UL, /*< 'cpsp' /
	LE_CSWH_FEATURE_TAG = 0x63737768UL, /*< 'cswh' /	LE_CSWH_FEATURE_TAG = 0x63737768UL, /*< 'cswh' /
	LE_CURS_FEATURE_TAG = 0x63757273UL, /*< 'curs' /	LE_CURS_FEATURE_TAG = 0x63757273UL, /*< 'curs' /
	LE_C2SC_FEATURE_TAG = 0x63327363UL, /*< 'c2sc' /	LE_C2SC_FEATURE_TAG = 0x63327363UL, /*< 'c2sc' /
	LE_C2PC_FEATURE_TAG = 0x63327063UL, /*< 'c2pc' /	LE_C2PC_FEATURE_TAG = 0x63327063UL, /*< 'c2pc' /
	LE_DIST_FEATURE_TAG = 0x64697374UL, /*< 'dist' /	LE_DIST_FEATURE_TAG = 0x64697374UL, /*< 'dist' /
	LE_DLIG_FEATURE_TAG = 0x646C6967UL, /*< 'dlig' /	LE_DLIG_FEATURE_TAG = 0x646C6967UL, /*< 'dlig' /
	LE_DNOM_FEATURE_TAG = 0x646E6F6DUL, /*< 'dnom' /	LE_DNOM_FEATURE_TAG = 0x646E6F6DUL, /*< 'dnom' /
	LE_EXPT_FEATURE_TAG = 0x65787074UL, /*< 'expt' /	LE_EXPT_FEATURE_TAG = 0x65787074UL, /*< 'expt' /

	skipping to change at line 464	skipping to change at line 465
	LE_PNUM_FEATURE_TAG = 0x706E756DUL, /*< 'pnum' /	LE_PNUM_FEATURE_TAG = 0x706E756DUL, /*< 'pnum' /
	LE_PREF_FEATURE_TAG = 0x70726566UL, /*< 'pref' /	LE_PREF_FEATURE_TAG = 0x70726566UL, /*< 'pref' /
	LE_PRES_FEATURE_TAG = 0x70726573UL, /*< 'pres' /	LE_PRES_FEATURE_TAG = 0x70726573UL, /*< 'pres' /
	LE_PSTF_FEATURE_TAG = 0x70737466UL, /*< 'pstf' /	LE_PSTF_FEATURE_TAG = 0x70737466UL, /*< 'pstf' /
	LE_PSTS_FEATURE_TAG = 0x70737473UL, /*< 'psts' /	LE_PSTS_FEATURE_TAG = 0x70737473UL, /*< 'psts' /
	LE_PWID_FEATURE_TAG = 0x70776964UL, /*< 'pwid' /	LE_PWID_FEATURE_TAG = 0x70776964UL, /*< 'pwid' /
	LE_QWID_FEATURE_TAG = 0x71776964UL, /*< 'qwid' /	LE_QWID_FEATURE_TAG = 0x71776964UL, /*< 'qwid' /
	LE_RAND_FEATURE_TAG = 0x72616E64UL, /*< 'rand' /	LE_RAND_FEATURE_TAG = 0x72616E64UL, /*< 'rand' /
	LE_RLIG_FEATURE_TAG = 0x726C6967UL, /*< 'rlig' /	LE_RLIG_FEATURE_TAG = 0x726C6967UL, /*< 'rlig' /
	LE_RPHF_FEATURE_TAG = 0x72706866UL, /*< 'rphf' /	LE_RPHF_FEATURE_TAG = 0x72706866UL, /*< 'rphf' /

		LE_RKRF_FEATURE_TAG = 0x726B7266UL, /*< 'rkrf' /
	LE_RTBD_FEATURE_TAG = 0x72746264UL, /*< 'rtbd' /	LE_RTBD_FEATURE_TAG = 0x72746264UL, /*< 'rtbd' /
	LE_RTLA_FEATURE_TAG = 0x72746C61UL, /*< 'rtla' /	LE_RTLA_FEATURE_TAG = 0x72746C61UL, /*< 'rtla' /
	LE_RUBY_FEATURE_TAG = 0x72756279UL, /*< 'ruby' /	LE_RUBY_FEATURE_TAG = 0x72756279UL, /*< 'ruby' /
	LE_SALT_FEATURE_TAG = 0x73616C74UL, /*< 'salt' /	LE_SALT_FEATURE_TAG = 0x73616C74UL, /*< 'salt' /
	LE_SINF_FEATURE_TAG = 0x73696E66UL, /*< 'sinf' /	LE_SINF_FEATURE_TAG = 0x73696E66UL, /*< 'sinf' /
	LE_SIZE_FEATURE_TAG = 0x73697A65UL, /*< 'size' /	LE_SIZE_FEATURE_TAG = 0x73697A65UL, /*< 'size' /
	LE_SMCP_FEATURE_TAG = 0x736D6370UL, /*< 'smcp' /	LE_SMCP_FEATURE_TAG = 0x736D6370UL, /*< 'smcp' /
	LE_SMPL_FEATURE_TAG = 0x736D706CUL, /*< 'smpl' /	LE_SMPL_FEATURE_TAG = 0x736D706CUL, /*< 'smpl' /
	LE_SS01_FEATURE_TAG = 0x73733031UL, /*< 'ss01' /	LE_SS01_FEATURE_TAG = 0x73733031UL, /*< 'ss01' /
	LE_SS02_FEATURE_TAG = 0x73733032UL, /*< 'ss02' /	LE_SS02_FEATURE_TAG = 0x73733032UL, /*< 'ss02' /

End of changes. 3 change blocks.
	1 lines changed or deleted	3 lines changed or added

	bms.h	bms.h

	skipping to change at line 16	skipping to change at line 16
	/**	/**
	* \file	* \file
	* \brief C API: Boyer-Moore StringSearch prototype.	* \brief C API: Boyer-Moore StringSearch prototype.
	* \internal	* \internal
	*/	*/

	#ifndef _BMS_H	#ifndef _BMS_H
	#define _BMS_H	#define _BMS_H

	#include "unicode/utypes.h"	#include "unicode/utypes.h"


		#if !UCONFIG_NO_COLLATION

	#include "unicode/ucol.h"	#include "unicode/ucol.h"

	/**	/**
	* A <code>UCD</code> object holds the Collator-specific data needed to	* A <code>UCD</code> object holds the Collator-specific data needed to
	* compute the length of the shortest string that can	* compute the length of the shortest string that can
	* generate a partcular list of CEs.	* generate a partcular list of CEs.
	*	*
	* <code>UCD</code> objects are quite expensive to compute. Because	* <code>UCD</code> objects are quite expensive to compute. Because
	* of this, they are cached. When you call <code>ucd_open</code> it	* of this, they are cached. When you call <code>ucd_open</code> it
	* returns a reference counted cached object. When you call <code>ucd_close </code>	* returns a reference counted cached object. When you call <code>ucd_close </code>

	skipping to change at line 37	skipping to change at line 40
	*	*
	* If you do not need to reuse any unreferenced objects in the cache, you c an call	* If you do not need to reuse any unreferenced objects in the cache, you c an call
	* <code>ucd_flushCCache</code>. If you no longer need any <code>UCD</code>	* <code>ucd_flushCCache</code>. If you no longer need any <code>UCD</code>
	* objects, you can call <code>ucd_freeCache</code>	* objects, you can call <code>ucd_freeCache</code>
	*/	*/
	typedef void UCD;	typedef void UCD;

	/**	/**
	* Open a <code>UCD</code> object.	* Open a <code>UCD</code> object.
	*	*

	* @param collator - the collator	* @param coll - the collator
	* @param status - will be set if any errors occur.	* @param status - will be set if any errors occur.
	*	*
	* @return the <code>UCD</code> object. You must call	* @return the <code>UCD</code> object. You must call
	* <code>ucd_close</code> when you are done using the object.	* <code>ucd_close</code> when you are done using the object.
	*	*
	* Note: if on return status is set to an error, the only safe	* Note: if on return status is set to an error, the only safe
	* thing to do with the returned object is to call <code>ucd_close</code>.	* thing to do with the returned object is to call <code>ucd_close</code>.
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/

	skipping to change at line 109	skipping to change at line 112
	U_CAPI void U_EXPORT2	U_CAPI void U_EXPORT2
	ucd_flushCache();	ucd_flushCache();

	/**	/**
	* BMS	* BMS
	*	*
	* This object holds the information needed to do a Collation sensitive Boy er-Moore search. It encapulates	* This object holds the information needed to do a Collation sensitive Boy er-Moore search. It encapulates
	* the pattern, the "bad character" and "good suffix" tables, the Collator- based data needed to compute them,	* the pattern, the "bad character" and "good suffix" tables, the Collator- based data needed to compute them,
	* and a reference to the text being searched.	* and a reference to the text being searched.
	*	*

	* To do a search, you fist need to get a <code>UCD</code> object by callin g <code>ucd_open</code>.	* To do a search, you first need to get a <code>UCD</code> object by calli ng <code>ucd_open</code>.
	* Then you construct a <code>BMS</code> object from the <code>UCD</code> o bject, the pattern	* Then you construct a <code>BMS</code> object from the <code>UCD</code> o bject, the pattern
	* string and the target string. Then you call the <code>search</code> meth od. Here's a code sample:	* string and the target string. Then you call the <code>search</code> meth od. Here's a code sample:
	*	*
	* <pre>	* <pre>
	* void boyerMooreExample(UCollator collator, UChar pattern, int32_t patt ernLen, UChar *target, int32_t targetLength)	* void boyerMooreExample(UCollator collator, UChar pattern, int32_t patt ernLen, UChar *target, int32_t targetLength)
	* {	* {
	* UErrorCode status = U_ZERO_ERROR;	* UErrorCode status = U_ZERO_ERROR;
	* int32_t offset = 0, start = -1, end = -1;	* int32_t offset = 0, start = -1, end = -1;
	* UCD *ucd = NULL);	* UCD *ucd = NULL);
	* BMS *bms = NULL;	* BMS *bms = NULL;

	skipping to change at line 180	skipping to change at line 183
	* in a discontiguous contraction may fail. The only known cases of th is are with	* in a discontiguous contraction may fail. The only known cases of th is are with
	* the Tibetan script. For example searching for the pattern	* the Tibetan script. For example searching for the pattern
	* "\u0F7F\u0F80\u0F81\u0F82\u0F83\u0F84\u0F85" will fail. (This case is artificial. We've	* "\u0F7F\u0F80\u0F81\u0F82\u0F83\u0F84\u0F85" will fail. (This case is artificial. We've
	* been unable to find a pratical, real-world example of this failure. )	* been unable to find a pratical, real-world example of this failure. )
	*	*
	* NOTE: This is a technology preview. The final version of this API may no t bear any resenblence to this API.	* NOTE: This is a technology preview. The final version of this API may no t bear any resenblence to this API.
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	struct BMS;	struct BMS;

	typedef struct BMS BMS;	typedef struct BMS BMS; /*< @see BMS /

	/**	/**
	* Construct a <code>MBS</code> object.	* Construct a <code>MBS</code> object.
	*	*
	* @param ucd - A <code>UCD</code> object holding the Collator-sensitive da ta	* @param ucd - A <code>UCD</code> object holding the Collator-sensitive da ta
	* @param pattern - the string for which to search	* @param pattern - the string for which to search

	* @param latternLength - the length of the string for which to search	* @param patternLength - the length of the string for which to search
	* @param target - the string in which to search	* @param target - the string in which to search
	* @param targetLength - the length of the string in which to search	* @param targetLength - the length of the string in which to search
	* @param status - will be set if any errors occur.	* @param status - will be set if any errors occur.
	*	*
	* @return the <code>BMS</code> object.	* @return the <code>BMS</code> object.
	*	*
	* Note: if on return status is set to an error, the only safe	* Note: if on return status is set to an error, the only safe
	* thing to do with the returned object is to call	* thing to do with the returned object is to call
	* <code>bms_close</code>.	* <code>bms_close</code>.
	*	*

	skipping to change at line 218	skipping to change at line 221
	* storage associated with it.	* storage associated with it.
	*	*
	* @param bms - the <code>BMS</code> object to close.	* @param bms - the <code>BMS</code> object to close.
	*/	*/
	U_CAPI void U_EXPORT2	U_CAPI void U_EXPORT2
	bms_close(BMS *bms);	bms_close(BMS *bms);

	/**	/**
	* Test the pattern to see if it generates any CEs.	* Test the pattern to see if it generates any CEs.
	*	*

		* @param bms - the <code>BMS</code> object
	* @return <code>TRUE</code> if the pattern string did not generate any CEs	* @return <code>TRUE</code> if the pattern string did not generate any CEs
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	U_CAPI UBool U_EXPORT2	U_CAPI UBool U_EXPORT2
	bms_empty(BMS *bms);	bms_empty(BMS *bms);

	/**	/**
	* Get the <code>UCD</code> object used to create	* Get the <code>UCD</code> object used to create
	* a given <code>BMS</code> object.	* a given <code>BMS</code> object.

	skipping to change at line 242	skipping to change at line 246
	* the given <code>BMS</code> object.	* the given <code>BMS</code> object.
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	U_CAPI UCD * U_EXPORT2	U_CAPI UCD * U_EXPORT2
	bms_getData(BMS *bms);	bms_getData(BMS *bms);

	/**	/**
	* Search for the pattern string in the target string.	* Search for the pattern string in the target string.
	*	*

		* @param bms - the <code>BMS</code> object
	* @param offset - the offset in the target string at which to begin the se arch	* @param offset - the offset in the target string at which to begin the se arch
	* @param start - will be set to the starting offset of the match, or -1 if there's no match	* @param start - will be set to the starting offset of the match, or -1 if there's no match
	* @param end - will be set to the ending offset of the match, or -1 if the re's no match	* @param end - will be set to the ending offset of the match, or -1 if the re's no match
	*	*
	* @return <code>TRUE</code> if the match succeeds, <code>FALSE</code> othe rwise.	* @return <code>TRUE</code> if the match succeeds, <code>FALSE</code> othe rwise.
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	U_CAPI UBool U_EXPORT2	U_CAPI UBool U_EXPORT2
	bms_search(BMS bms, int32_t offset, int32_t start, int32_t *end);	bms_search(BMS bms, int32_t offset, int32_t start, int32_t *end);

	/**	/**
	* Set the target string for the match.	* Set the target string for the match.
	*	*

		* @param bms - the <code>BMS</code> object
	* @param target - the new target string	* @param target - the new target string
	* @param targetLength - the length of the new target string	* @param targetLength - the length of the new target string
	* @param status - will be set if any errors occur.	* @param status - will be set if any errors occur.
	*	*
	* @internal ICU 4.0.1 technology preview	* @internal ICU 4.0.1 technology preview
	*/	*/
	U_CAPI void U_EXPORT2	U_CAPI void U_EXPORT2
	bms_setTargetString(BMS bms, const UChar target, int32_t targetLength, UE rrorCode *status);	bms_setTargetString(BMS bms, const UChar target, int32_t targetLength, UE rrorCode *status);


		#endif

	#endif /* _BMS_H */	#endif /* _BMS_H */

End of changes. 9 change blocks.
	4 lines changed or deleted	12 lines changed or added

	calendar.h	calendar.h

	skipping to change at line 374	skipping to change at line 374
	* order that would make a difference. These are all and only those val ues where	* order that would make a difference. These are all and only those val ues where
	* the open (creation) of the service with the locale formed from the i nput locale	* the open (creation) of the service with the locale formed from the i nput locale
	* plus input keyword and that value has different behavior than creati on with the	* plus input keyword and that value has different behavior than creati on with the
	* input locale alone.	* input locale alone.
	* @param key one of the keys supported by this service. For now, only	* @param key one of the keys supported by this service. For now, only
	* "calendar" is supported.	* "calendar" is supported.
	* @param locale the locale	* @param locale the locale
	* @param commonlyUsed if set to true it will return only commonly use d values	* @param commonlyUsed if set to true it will return only commonly use d values
	* with the given locale in preferred order. Othe rwise,	* with the given locale in preferred order. Othe rwise,
	* it will return all the available values for the locale.	* it will return all the available values for the locale.

		* @param status ICU Error Code
	* @return a string enumeration over keyword values for the given key a nd the locale.	* @return a string enumeration over keyword values for the given key a nd the locale.
	* @draft ICU 4.2	* @draft ICU 4.2
	*/	*/
	static StringEnumeration* U_EXPORT2 getKeywordValuesForLocale(const cha r* key,	static StringEnumeration* U_EXPORT2 getKeywordValuesForLocale(const cha r* key,
	const Locale& locale, UBool commonlyUsed, UErrorCode& s tatus);	const Locale& locale, UBool commonlyUsed, UErrorCode& s tatus);

	/**	/**
	* Returns the current UTC (GMT) time measured in milliseconds since 0: 00:00 on 1/1/70	* Returns the current UTC (GMT) time measured in milliseconds since 0: 00:00 on 1/1/70
	* (derived from the system time).	* (derived from the system time).
	*	*

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added