removed extra wxSTD

[wxWidgets.git] / src / regex / regcomp.c

diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index dc4860110995a274b63299c9deff341cedcfced2..17557ddd14eaa0138e843cf446aebcd9318f2ca4 100644 (file)
--- a/src/regex/regcomp.c
+++ b/src/regex/regcomp.c
@@ -4,7 +4,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <regex.h>
+#include "regex.h"
 
 #include "utils.h"
 #include "regex2.h"
@@ -51,7 +51,7 @@ static char nuls[10];         /* place to point scanner in event of error */
 #define        NEXTn(n)        (p->next += (n))
 #define        GETNEXT()       (*p->next++)
 #define        SETERROR(e)     seterr(p, (e))
-#define        REQUIRE(co, e)  ((co) || SETERROR(e))
+#define        REQUIRE(co, e)  ((void)((co) || SETERROR(e)))
 #define        MUSTSEE(c, e)   (REQUIRE(MORE() && PEEK() == (c), e))
 #define        MUSTEAT(c, e)   (REQUIRE(MORE() && GETNEXT() == (c), e))
 #define        MUSTNOTSEE(c, e)        (REQUIRE(!MORE() || PEEK() != (c), e))
@@ -1054,7 +1054,7 @@ freeset(p, cs)
 register struct parse *p;
 register cset *cs;
 {
-       register int i;
+       register size_t i;
        register cset *top = &p->g->sets[p->g->ncsets];
        register size_t css = (size_t)p->g->csetsize;
 
@@ -1080,7 +1080,7 @@ register struct parse *p;
 register cset *cs;
 {
        register uch h = cs->hash;
-       register int i;
+       register size_t i;
        register cset *top = &p->g->sets[p->g->ncsets];
        register cset *cs2;
        register size_t css = (size_t)p->g->csetsize;
@@ -1113,7 +1113,7 @@ firstch(p, cs)
 register struct parse *p;
 register cset *cs;
 {
-       register int i;
+       register size_t i;
        register size_t css = (size_t)p->g->csetsize;
 
        for (i = 0; i < css; i++)
@@ -1132,7 +1132,7 @@ nch(p, cs)
 register struct parse *p;
 register cset *cs;
 {
-       register int i;
+       register size_t i;
        register size_t css = (size_t)p->g->csetsize;
        register int n = 0;
 
@@ -1169,6 +1169,8 @@ register char *cp;
        cs->multis[cs->smultis - 1] = '\0';
 }
 
+/* these functions don't seem to be used (yet?), suppress warnings */
+#if 0
 /*
  - mcsub - subtract a collating element from a cset
  == static void mcsub(register cset *cs, register char *cp);
@@ -1226,6 +1228,7 @@ register char *cp;
                        return(p);
        return(NULL);
 }
+#endif /* 0 */
 
 /*
  - mcinvert - invert the list of collating elements in a cset