X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17aa28a91b881060b4f2fe78c929dcc93da426bf..1680c3561bc4f44c63a026e0d1a5324a39336156:/src/regex/regcomp.c diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c index c634d6b1b9..83edc37b34 100644 --- a/src/regex/regcomp.c +++ b/src/regex/regcomp.c @@ -235,11 +235,11 @@ struct vars { #define ISERR() VISERR(v) #define VERR(vv,e) ((vv)->nexttype = EOS, ((vv)->err) ? (vv)->err :\ ((vv)->err = (e))) -#define ERR(e) VERR(v, e) /* record an error */ +#define ERR(e) (void)VERR(v, e) /* record an error */ #define NOERR() {if (ISERR()) return;} /* if error seen, return */ #define NOERRN() {if (ISERR()) return NULL;} /* NOERR with retval */ #define NOERRZ() {if (ISERR()) return 0;} /* NOERR with retval */ -#define INSIST(c, e) ((c) ? 0 : ERR(e)) /* if condition false, error */ +#define INSIST(c, e) (void)((c) ? (void)0 : ERR(e)) /* if condition false, error */ #define NOTE(b) (v->re->re_info |= (b)) /* note visible condition */ #define EMPTYARC(x, y) newarc(v->nfa, EMPTY, 0, x, y) @@ -2168,7 +2168,7 @@ size_t bufsize; if (t->retry != 0) sprintf(buf, "%d", t->retry); else - sprintf(buf, "0x%x", (int)t); /* may lose bits, that's okay */ + sprintf(buf, "0x%x", (int)(wxUIntPtr)(t)); /* may lose bits, that's okay */ return buf; }