From c9c6875014661d4326100bae0464279d76bd657f Mon Sep 17 00:00:00 2001 From: Kean Johnston Date: Sat, 2 Dec 2006 13:36:56 -0800 Subject: [PATCH] Don't use varargs CPP macros in fccache.c. (bug 8733) src/fccache.c uses a trick to try and use a function name that is also a macro name. It does this using the varargs args() macro. Replace that with separate macros for each number of formals. --- src/fccache.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/fccache.c b/src/fccache.c index ba6af72..3185059 100644 --- a/src/fccache.c +++ b/src/fccache.c @@ -826,16 +826,17 @@ FcDirCacheWrite (FcCache *cache, FcConfig *config) * Hokey little macro trick to permit the definitions of C functions * with the same name as CPP macros */ -#define args(x...) (x) +#define args1(x) (x) +#define args2(x,y) (x,y) const FcChar8 * -FcCacheDir args(const FcCache *c) +FcCacheDir args1(const FcCache *c) { return FcCacheDir (c); } FcFontSet * -FcCacheCopySet args(const FcCache *c) +FcCacheCopySet args1(const FcCache *c) { FcFontSet *old = FcCacheSet (c); FcFontSet *new = FcFontSetCreate (); @@ -858,19 +859,19 @@ FcCacheCopySet args(const FcCache *c) } const FcChar8 * -FcCacheSubdir args(const FcCache *c, int i) +FcCacheSubdir args2(const FcCache *c, int i) { return FcCacheSubdir (c, i); } int -FcCacheNumSubdir args(const FcCache *c) +FcCacheNumSubdir args1(const FcCache *c) { return c->dirs_count; } int -FcCacheNumFont args(const FcCache *c) +FcCacheNumFont args1(const FcCache *c) { return FcCacheSet(c)->nfont; } -- 2.39.5