diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2014-07-06 18:26:03 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2014-07-06 18:26:03 -0400 |
| commit | da8233b0f244676ea372ffa485b6cb329700c8ca (patch) | |
| tree | 012115e3e5c3282d488035750a77120196e58743 | |
| parent | bb27d6969ce0ef1244e73f9c6232f91bce60dad7 (diff) | |
Fixup previous commit
| -rw-r--r-- | src/fcmatch.c | 12 | ||||
| -rw-r--r-- | src/fcobjs.h | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/fcmatch.c b/src/fcmatch.c index ce0d18d5..78255186 100644 --- a/src/fcmatch.c +++ b/src/fcmatch.c @@ -245,17 +245,6 @@ FcCompareFilename (FcValue *v1, FcValue *v2) return 3.0; } -static double -FcCompareHash (FcValue *v1, FcValue *v2) -{ - const FcChar8 *s1 = FcValueString (v1), *s2 = FcValueString (v2); - - /* Do not match an empty string */ - if (!s1 || !s2 || !s1[0] || !s2[0]) - return 1.0; - return FcCompareString (v1, v2); -} - /* Define priorities to -1 for objects that don't have a compare function. */ @@ -272,7 +261,6 @@ FcCompareHash (FcValue *v1, FcValue *v2) #define PRI_FcCompareCharSet(n) PRI1(n) #define PRI_FcCompareLang(n) PRI1(n) #define PRI_FcComparePostScript(n) PRI1(n) -#define PRI_FcCompareHash(n) PRI1(n) #define PRI_FcCompareSizeRange(n) PRI1(n) #define FC_OBJECT(NAME, Type, Cmp) PRI_##Cmp(NAME) diff --git a/src/fcobjs.h b/src/fcobjs.h index dc3d8340..bfdf4b58 100644 --- a/src/fcobjs.h +++ b/src/fcobjs.h @@ -66,6 +66,6 @@ FC_OBJECT (LCD_FILTER, FcTypeInteger, NULL) FC_OBJECT (NAMELANG, FcTypeString, NULL) FC_OBJECT (FONT_FEATURES, FcTypeString, NULL) FC_OBJECT (PRGNAME, FcTypeString, NULL) -FC_OBJECT (HASH, FcTypeString, FcCompareHash) /* deprecated */ +FC_OBJECT (HASH, FcTypeString, NULL) /* deprecated */ FC_OBJECT (POSTSCRIPT_NAME, FcTypeString, FcComparePostScript) /* ^-------------- Add new objects here. */ |