gee, you'ld think gnu would get pointer <-> int portability right :P

This commit is contained in:
Bill Currie 2002-11-19 05:40:04 +00:00
parent 599b51b542
commit 1251cbda9e

View file

@ -2498,10 +2498,10 @@ typedef struct
DEBUG_PRINT_COMPILED_PATTERN (bufp, pat, pend); \ DEBUG_PRINT_COMPILED_PATTERN (bufp, pat, pend); \
\ \
/* Restore register info. */ \ /* Restore register info. */ \
high_reg = (unsigned) POP_FAILURE_ITEM (); \ high_reg = (unsigned long) POP_FAILURE_ITEM (); \
DEBUG_PRINT2 (" Popping high active reg: %d\n", high_reg); \ DEBUG_PRINT2 (" Popping high active reg: %d\n", high_reg); \
\ \
low_reg = (unsigned) POP_FAILURE_ITEM (); \ low_reg = (unsigned long) POP_FAILURE_ITEM (); \
DEBUG_PRINT2 (" Popping low active reg: %d\n", low_reg); \ DEBUG_PRINT2 (" Popping low active reg: %d\n", low_reg); \
\ \
for (this_reg = high_reg; this_reg >= low_reg; this_reg--) \ for (this_reg = high_reg; this_reg >= low_reg; this_reg--) \
@ -3214,8 +3214,8 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
unsigned num_regs = bufp->re_nsub + 1; unsigned num_regs = bufp->re_nsub + 1;
/* The currently active registers. */ /* The currently active registers. */
unsigned lowest_active_reg = NO_LOWEST_ACTIVE_REG; unsigned long lowest_active_reg = NO_LOWEST_ACTIVE_REG;
unsigned highest_active_reg = NO_HIGHEST_ACTIVE_REG; unsigned long highest_active_reg = NO_HIGHEST_ACTIVE_REG;
/* Information on the contents of registers. These are pointers into /* Information on the contents of registers. These are pointers into
the input strings; they record just what was matched (on this the input strings; they record just what was matched (on this
@ -3768,7 +3768,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
regstart[r] = old_regstart[r]; regstart[r] = old_regstart[r];
/* xx why this test? */ /* xx why this test? */
if ((int) old_regend[r] >= (int) regstart[r]) if ((long) old_regend[r] >= (long) regstart[r])
regend[r] = old_regend[r]; regend[r] = old_regend[r];
} }
} }
@ -4075,7 +4075,7 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
actual values. Otherwise, we will restore only one actual values. Otherwise, we will restore only one
register from the stack, since lowest will == highest in register from the stack, since lowest will == highest in
`pop_failure_point'. */ `pop_failure_point'. */
unsigned dummy_low_reg, dummy_high_reg; unsigned long dummy_low_reg, dummy_high_reg;
unsigned char *pdummy; unsigned char *pdummy;
const char *sdummy; const char *sdummy;