walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use variables named 'bool' (bug #18851)

This commit is contained in:
Harald Fernengel 2008-12-28 03:23:58 -05:00 committed by Behdad Esfahbod
parent a9ac5c52a6
commit fe8e8a1dd7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fcxml.c
View File

@ -450,7 +450,7 @@ typedef struct _FcVStack {
int integer; int integer;
double _double; double _double;
FcMatrix *matrix; FcMatrix *matrix;
FcBool bool; FcBool bool_;
FcTest *test; FcTest *test;
FcQual qual; FcQual qual;
@ -821,12 +821,12 @@ FcVStackPushMatrix (FcConfigParse *parse, FcMatrix *matrix)
} }
static FcBool static FcBool
FcVStackPushBool (FcConfigParse *parse, FcBool bool) FcVStackPushBool (FcConfigParse *parse, FcBool bool_)
{ {
FcVStack *vstack = FcVStackCreate (); FcVStack *vstack = FcVStackCreate ();
if (!vstack) if (!vstack)
return FcFalse; return FcFalse;
vstack->u.bool = bool; vstack->u.bool_ = bool_;
vstack->tag = FcVStackBool; vstack->tag = FcVStackBool;
FcVStackPush (parse, vstack); FcVStackPush (parse, vstack);
return FcTrue; return FcTrue;
@ -1266,13 +1266,13 @@ FcParseMatrix (FcConfigParse *parse)
} }
static FcBool static FcBool
FcConfigLexBool (FcConfigParse *parse, const FcChar8 *bool) FcConfigLexBool (FcConfigParse *parse, const FcChar8 *bool_)
{ {
FcBool result = FcFalse; FcBool result = FcFalse;
if (!FcNameBool (bool, &result)) if (!FcNameBool (bool_, &result))
FcConfigMessage (parse, FcSevereWarning, "\"%s\" is not known boolean", FcConfigMessage (parse, FcSevereWarning, "\"%s\" is not known boolean",
bool); bool_);
return result; return result;
} }
@ -1540,7 +1540,7 @@ FcPopExpr (FcConfigParse *parse)
expr = FcExprCreateMatrix (vstack->u.matrix); expr = FcExprCreateMatrix (vstack->u.matrix);
break; break;
case FcVStackBool: case FcVStackBool:
expr = FcExprCreateBool (vstack->u.bool); expr = FcExprCreateBool (vstack->u.bool_);
break; break;
case FcVStackTest: case FcVStackTest:
break; break;
@ -1955,7 +1955,7 @@ FcPopValue (FcConfigParse *parse)
value.type = FcTypeMatrix; value.type = FcTypeMatrix;
break; break;
case FcVStackBool: case FcVStackBool:
value.u.b = vstack->u.bool; value.u.b = vstack->u.bool_;
value.type = FcTypeBool; value.type = FcTypeBool;
break; break;
default: default: