diff options
author | Keith Packard <keithp@koto.keithp.com> | 2007-11-03 21:58:34 -0700 |
---|---|---|
committer | Keith Packard <keithp@koto.keithp.com> | 2007-11-03 21:58:34 -0700 |
commit | c833409f6b68c191ac354cd2fdeb183f73a65c4c (patch) | |
tree | 1665b9825c482d977b526caa43f75259491858a5 /src/fclang.c | |
parent | 9b84ecff92b8dccf6559a858e35762c0f664429a (diff) | |
download | fontconfig-c833409f6b68c191ac354cd2fdeb183f73a65c4c.tar.gz |
Use FcLangDifferentTerritory instead of FcLangDifferentCountry.
Diffstat (limited to 'src/fclang.c')
-rw-r--r-- | src/fclang.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) |