[Firebird-checkins] CVS: firebird2/src/intl lc_iso8859_1.cpp, 1.20, 1.21 lc_iso8859_13.cpp, 1.4, 1.5 lc_iso8859_2.cpp, 1.15, 1.16 lc_narrow.cpp, 1.22, 1.23 lc_narrow.h, 1.10, 1.11

[Adriano d. S. F. <asf...@us...>]

Build Version :  T2.1.0.15728 Firebird 2.1 Alpha 1

(writeBuildNum.sh,v 1.15884 2007/05/04 14:49:02 asfernandes )

Update of /cvsroot/firebird/firebird2/src/intl
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30217/src/intl

Modified Files:
	lc_iso8859_1.cpp lc_iso8859_13.cpp lc_iso8859_2.cpp 
	lc_narrow.cpp lc_narrow.h 
Log Message:
Allow all narrow collations to use the new attributes.

Index: lc_iso8859_1.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/intl/lc_iso8859_1.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -U3 -r1.20 -r1.21
--- lc_iso8859_1.cpp	16 Oct 2006 19:17:44 -0000	1.20
+++ lc_iso8859_1.cpp	4 May 2007 14:48:59 -0000	1.21
@@ -36,7 +36,7 @@
 
 #include "../intl/collations/koi8r_ru.h"
 
-	return LC_NARROW_family2(cache, cs, CC_RUSSIA, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_RUSSIA, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -48,7 +48,7 @@
 
 #include "../intl/collations/koi8u_ua.h"
 
-	return LC_NARROW_family2(cache, cs, CC_INTL, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_INTL, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -60,7 +60,7 @@
 
 #include "../intl/collations/bl88591da0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_DENMARK, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_DENMARK, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -72,7 +72,7 @@
 
 #include "../intl/collations/bl88591nl0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_NEDERLANDS, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_NEDERLANDS, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -84,7 +84,7 @@
 
 #include "../intl/collations/bl88591fi0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_FINLAND, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_FINLAND, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -96,7 +96,7 @@
 
 #include "../intl/collations/bl88591fr0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_FRANCE, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_FRANCE, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -108,7 +108,7 @@
 
 #include "../intl/collations/bl88591ca0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_FRENCHCAN, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_FRENCHCAN, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -120,7 +120,7 @@
 
 #include "../intl/collations/bl88591de0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_GERMANY, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_GERMANY, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -132,7 +132,7 @@
 
 #include "../intl/collations/bl88591is0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_ICELAND, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_ICELAND, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -144,7 +144,7 @@
 
 #include "../intl/collations/bl88591it0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_ITALY, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_ITALY, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -157,7 +157,7 @@
 
 #include "../intl/collations/bl88591no0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_NORWAY, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_NORWAY, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -181,7 +181,7 @@
 
 #include "../intl/collations/bl88591sv0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_SWEDEN, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_SWEDEN, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -193,7 +193,7 @@
 
 #include "../intl/collations/bl88591uk0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_UK, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_UK, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -205,7 +205,7 @@
 
 #include "../intl/collations/bl88591us0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_US, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_US, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -217,7 +217,7 @@
 
 #include "../intl/collations/bl88591pt0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_PORTUGAL, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_PORTUGAL, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -253,7 +253,7 @@
 
 #include "../intl/collations/pw1250czech.h"
 
-	return LC_NARROW_family2(cache, cs, CC_CZECH, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_CZECH, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -265,7 +265,7 @@
 
 #include "../intl/collations/pw1250hundc.h"
 
-	return LC_NARROW_family2(cache, cs, CC_HUNGARY, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_HUNGARY, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -277,7 +277,7 @@
 
 #include "../intl/collations/pw1250polish.h"
 
-	return LC_NARROW_family2(cache, cs, CC_POLAND, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_POLAND, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -289,7 +289,7 @@
 
 #include "../intl/collations/pw1250slov.h"
 
-	return LC_NARROW_family2(cache, cs, CC_YUGOSLAVIA, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_YUGOSLAVIA, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -301,7 +301,7 @@
 
 #include "../intl/collations/pw1250hun.h"
 
-	return LC_NARROW_family2(cache, cs, CC_HUNGARY, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_HUNGARY, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -313,7 +313,7 @@
 
 #include "../intl/collations/win1250bsba.h"
 
-	return LC_NARROW_family2(cache, cs, CC_YUGOSLAVIA, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_YUGOSLAVIA, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -349,7 +349,7 @@
 
 #include "../intl/collations/pw1251cyrr.h"
 
-	return LC_NARROW_family2(cache, cs, CC_RUSSIA, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_RUSSIA, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -361,7 +361,7 @@
 
 #include "../intl/collations/xx1251_ua.h"
 
-	return LC_NARROW_family2(cache, cs, CC_RUSSIA, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_RUSSIA, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -373,7 +373,7 @@
 
 #include "../intl/collations/pw1252intl.h"
 
-	return LC_NARROW_family2(cache, cs, CC_INTL, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_INTL, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -385,7 +385,7 @@
 
 #include "../intl/collations/pw1252i850.h"
 
-	return LC_NARROW_family2(cache, cs, CC_INTL, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_INTL, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -397,7 +397,7 @@
 
 #include "../intl/collations/pw1252nor4.h"
 
-	return LC_NARROW_family2(cache, cs, CC_NORDAN, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_NORDAN, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -409,7 +409,7 @@
 
 #include "../intl/collations/pw1252span.h"
 
-	return LC_NARROW_family2(cache, cs, CC_SPAIN, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_SPAIN, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -421,7 +421,7 @@
 
 #include "../intl/collations/pw1252swfn.h"
 
-	return LC_NARROW_family2(cache, cs, CC_SWEDFIN, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_SWEDFIN, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -445,7 +445,7 @@
 
 #include "../intl/collations/pw1253greek1.h"
 
-	return LC_NARROW_family2(cache, cs, CC_GREECE, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_GREECE, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -457,7 +457,7 @@
 
 #include "../intl/collations/pw1254turk.h"
 
-	return LC_NARROW_family2(cache, cs, CC_TURKEY, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_TURKEY, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -469,7 +469,7 @@
 
 #include "../intl/collations/win1257_ee.h"
 
-	return LC_NARROW_family2(cache, cs, CC_INTL, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_INTL, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -481,7 +481,7 @@
 
 #include "../intl/collations/win1257_lt.h"
 
-	return LC_NARROW_family2(cache, cs, CC_INTL, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_INTL, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -493,7 +493,7 @@
 
 #include "../intl/collations/win1257_lv.h"
 
-	return LC_NARROW_family2(cache, cs, CC_INTL, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_INTL, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -505,7 +505,7 @@
 
 #include "../intl/collations/blNEXTus0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_US, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_US, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -517,7 +517,7 @@
 
 #include "../intl/collations/blNEXTde0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_GERMANY, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_GERMANY, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -529,7 +529,7 @@
 
 #include "../intl/collations/blNEXTfr0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_FRANCE, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_FRANCE, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -541,7 +541,7 @@
 
 #include "../intl/collations/blNEXTit0.h"
 
-	return LC_NARROW_family2(cache, cs, CC_ITALY, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_ITALY, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }

Index: lc_iso8859_13.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/intl/lc_iso8859_13.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -U3 -r1.4 -r1.5
--- lc_iso8859_13.cpp	16 Oct 2006 19:17:44 -0000	1.4
+++ lc_iso8859_13.cpp	4 May 2007 14:48:59 -0000	1.5
@@ -30,7 +30,7 @@
 
 #include "../intl/collations/xx885913lt.h"
 
-	return LC_NARROW_family2(cache, cs, CC_LITHUANIA, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_LITHUANIA, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }

Index: lc_iso8859_2.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/intl/lc_iso8859_2.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -U3 -r1.15 -r1.16
--- lc_iso8859_2.cpp	16 Oct 2006 19:17:44 -0000	1.15
+++ lc_iso8859_2.cpp	4 May 2007 14:48:59 -0000	1.16
@@ -31,7 +31,7 @@
 
 #include "../intl/collations/xx88592czech.h"
 
-	return LC_NARROW_family2(cache, cs, CC_CZECH, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_CZECH, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -42,7 +42,7 @@
 
 #include "../intl/collations/xx88592hun.h"
 
-	return LC_NARROW_family2(cache, cs, CC_HUNGARY, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_HUNGARY, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }
@@ -53,7 +53,7 @@
 
 #include "../intl/collations/xx88592plk.h"
 
-	return LC_NARROW_family2(cache, cs, CC_POLAND, LDRV_TIEBREAK,
+	return LC_NARROW_family3(cache, cs, CC_POLAND, LDRV_TIEBREAK,
 			NoCaseOrderTbl, ToUpperConversionTbl, ToLowerConversionTbl,
 			CompressTbl, ExpansionTbl, POSIX, attributes, specific_attributes, specific_attributes_length);
 }

Index: lc_narrow.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/intl/lc_narrow.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -b -U3 -r1.22 -r1.23
--- lc_narrow.cpp	11 Apr 2007 16:04:57 -0000	1.22
+++ lc_narrow.cpp	4 May 2007 14:48:59 -0000	1.23
@@ -34,6 +34,10 @@
 using namespace Firebird;
 
 
+static bool LC_NARROW_family2(texttype* tt, charset* cs, SSHORT country, USHORT flags,
+	const SortOrderTblEntry* noCaseOrderTbl, const BYTE* toUpperConversionTbl,
+	const BYTE* toLowerConversionTbl, const CompressPair* compressTbl, const ExpandChar* expansionTbl,
+	const ASCII* name, USHORT attributes, const UCHAR* specificAttributes, ULONG specificAttributesLength);
 static ULONG fam2_str_to_upper(texttype* obj, ULONG iLen, const BYTE* pStr, ULONG iOutLen, BYTE *pOutStr);
 static ULONG fam2_str_to_lower(texttype* obj, ULONG iLen, const BYTE* pStr, ULONG iOutLen, BYTE *pOutStr);
 

Index: lc_narrow.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/intl/lc_narrow.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -U3 -r1.10 -r1.11
--- lc_narrow.h	9 Dec 2006 00:16:57 -0000	1.10
+++ lc_narrow.h	4 May 2007 14:48:59 -0000	1.11
@@ -69,21 +69,6 @@
 ULONG LC_NARROW_canonical(texttype* obj, ULONG srcLen, const UCHAR* src, ULONG dstLen, UCHAR* dst);
 void LC_NARROW_destroy(texttype* obj);
 
-bool LC_NARROW_family2(
-	texttype* tt,
-	charset* cs,
-	SSHORT country,
-	USHORT flags,
-	const SortOrderTblEntry* noCaseOrderTbl,
-	const BYTE* toUpperConversionTbl,
-	const BYTE* toLowerConversionTbl,
-	const CompressPair* compressTbl,
-	const ExpandChar* expansionTbl,
-	const ASCII* name,
-	USHORT attributes,
-	const UCHAR* specificAttributes,
-	ULONG specificAttributesLength);
-
 bool LC_NARROW_family3(
 	texttype* tt,
 	charset* cs,