diff options
Diffstat (limited to 'regex')
| -rw-r--r-- | regex/regcomp.c | 15 | ||||
| -rw-r--r-- | regex/regex.h | 4 | ||||
| -rw-r--r-- | regex/regex2.h | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/regex/regcomp.c b/regex/regcomp.c index 5990b121f9b..885c6a7cbc8 100644 --- a/regex/regcomp.c +++ b/regex/regcomp.c @@ -132,7 +132,7 @@ int cflags; (NC-1)*sizeof(cat_t)); if (g == NULL) return(REG_ESPACE); - p->ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */ + p->ssize = (long) (len/(size_t)2*(size_t)3 + (size_t)1); /* ugh */ p->strip = (sop *)malloc(p->ssize * sizeof(sop)); p->slen = 0; if (p->strip == NULL) { @@ -268,7 +268,7 @@ register struct parse *p; case '(': REQUIRE(MORE(), REG_EPAREN); p->g->nsub++; - subno = p->g->nsub; + subno = (sopno) p->g->nsub; if (subno < NPAREN) p->pbegin[subno] = HERE(); EMIT(OLPAREN, subno); @@ -488,7 +488,7 @@ int starordinary; /* is a leading * an ordinary character? */ break; case BACKSL|'(': p->g->nsub++; - subno = p->g->nsub; + subno = (sopno) p->g->nsub; if (subno < NPAREN) p->pbegin[subno] = HERE(); EMIT(OLPAREN, subno); @@ -811,8 +811,11 @@ int endc; /* name ended by endc,']' */ { register char *sp = p->next; register struct cname *cp; +#ifdef _WIN64 + register __int64 len; +#else register int len; - +#endif while (MORE() && !SEETWO(endc, ']')) NEXT(); if (!MORE()) { @@ -1076,9 +1079,9 @@ register cset *cs; register size_t css = (size_t)p->g->csetsize; for (i = 0; i < css; i++) - CHsub(cs, i); + CHsub(cs, i); if (cs == top-1) /* recover only the easy case */ - p->g->ncsets--; + p->g->ncsets--; } /* diff --git a/regex/regex.h b/regex/regex.h index fb2cd29ea46..99a0077251e 100644 --- a/regex/regex.h +++ b/regex/regex.h @@ -6,7 +6,11 @@ extern "C" { #endif /* === regex2.h === */ +#ifdef _WIN64 +typedef __int64 regoff_t; +#else typedef off_t regoff_t; +#endif struct re_guts; /* none of your business :-) */ typedef struct { int re_magic; diff --git a/regex/regex2.h b/regex/regex2.h index 2023716eb4a..0d94baa310f 100644 --- a/regex/regex2.h +++ b/regex/regex2.h @@ -95,8 +95,8 @@ typedef struct { char *multis; /* -> char[smulti] ab\0cd\0ef\0\0 */ } cset; /* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */ -#define CHadd(cs, c) ((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (c)) -#define CHsub(cs, c) ((cs)->ptr[(uch)(c)] &= ~(cs)->mask, (cs)->hash -= (c)) +#define CHadd(cs, c) ((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (uch) (c)) +#define CHsub(cs, c) ((cs)->ptr[(uch)(c)] &= ~(cs)->mask, (cs)->hash -= (uch)(c)) #define CHIN(cs, c) ((cs)->ptr[(uch)(c)] & (cs)->mask) #define MCadd(p, cs, cp) mcadd(p, cs, cp) /* regcomp() internal fns */ #define MCsub(p, cs, cp) mcsub(p, cs, cp) |