]> git.wh0rd.org - fontconfig.git/commitdiff
Use FcLangDifferentTerritory instead of FcLangDifferentCountry.
authorKeith Packard <keithp@koto.keithp.com>
Sun, 4 Nov 2007 04:58:34 +0000 (21:58 -0700)
committerKeith Packard <keithp@koto.keithp.com>
Sun, 4 Nov 2007 04:58:34 +0000 (21:58 -0700)
src/fclang.c

index 13f0ca21fb932c232c58a4eecc5ec17b6e769072..361803a60e44a295263626dce35d1396f96abebc 100644 (file)
@@ -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)