[PATCH] Fix compilation on platforms without regex

Jon TURNEY jon.turney at dronecode.org.uk
Fri Apr 20 02:45:19 PDT 2012


Fix up changes in ac6271dbac32086ce60845efc4d87e669f37796a.
- USE_REGEX is always defined, so we should check it's value, not for existence
- _FcStrRegexCmp() macro has wrong number of arguments

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 src/fcstr.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fcstr.c b/src/fcstr.c
index a6f0ba7..534f3f3 100644
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -272,7 +272,7 @@ FcStrCmp (const FcChar8 *s1, const FcChar8 *s2)
     return (int) c1 - (int) c2;
 }
 
-#ifdef USE_REGEX
+#if USE_REGEX
 static FcBool
 _FcStrRegexCmp (const FcChar8 *s, const FcChar8 *regex, int cflags, int eflags)
 {
@@ -306,7 +306,7 @@ _FcStrRegexCmp (const FcChar8 *s, const FcChar8 *regex, int cflags, int eflags)
     return ret == 0 ? FcTrue : FcFalse;
 }
 #else
-#  define _FcStrRegexCmp(_s_, _regex_)	(FcFalse)
+#  define _FcStrRegexCmp(_s_, _regex_, _cflags_, _eflags_) (FcFalse)
 #endif
 
 FcBool
-- 
1.7.9


--------------010200010301020206010307--


More information about the Fontconfig mailing list