From: Keith Packard <keithp@koto.keithp.com>
Date: Sun, 4 Nov 2007 04:58:34 +0000 (-0700)
Subject: Use FcLangDifferentTerritory instead of FcLangDifferentCountry.
X-Git-Tag: 2.4.92~27
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c833409f6b68c191ac354cd2fdeb183f73a65c4c;p=fontconfig.git

Use FcLangDifferentTerritory instead of FcLangDifferentCountry.
---

diff --git a/src/fclang.c b/src/fclang.c
index 13f0ca2..361803a 100644
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -150,13 +150,13 @@ FcLangCompare (const FcChar8 *s1, const FcChar8 *s2)
 	if (c1 != c2)
 	{
 	    if (FcLangEnd (c1) && FcLangEnd (c2))
-		result = FcLangDifferentCountry;
+		result = FcLangDifferentTerritory;
 	    return result;
 	}
 	else if (!c1)
 	    return FcLangEqual;
 	else if (c1 == '-')
-	    result = FcLangDifferentCountry;
+	    result = FcLangDifferentTerritory;
     }
 }
 
@@ -206,7 +206,7 @@ FcCharSetForLang (const FcChar8 *lang)
 	switch (FcLangCompare (lang, fcLangCharSets[i].lang)) {
 	case FcLangEqual:
 	    return &fcLangCharSets[i].charset;
-	case FcLangDifferentCountry:
+	case FcLangDifferentTerritory:
 	    if (country == -1)
 		country = i;
 	default:
@@ -437,7 +437,7 @@ FcLangSetCompare (const FcLangSet *lsa, const FcLangSet *lsb)
 	    if ((lsa->map[i] & fcLangCountrySets[j][i]) &&
 		(lsb->map[i] & fcLangCountrySets[j][i]))
 	    {
-		best = FcLangDifferentCountry;
+		best = FcLangDifferentTerritory;
 		break;
 	    }
     if (lsa->extra)