[win32] support win32_select(0,0,0,msec) (winsock doesn't)

[p5sagit/p5-mst-13.2.git] / regcomp.c

diff --git a/regcomp.c b/regcomp.c
index 603a421..bb1b86a 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -60,9 +60,9 @@
 #define REG_COMP_C
 #include "regcomp.h"
 
-#ifdef USE_THREADS
+#ifdef op
 #undef op
-#endif /* USE_THREADS */
+#endif /* op */
 
 static regnode regdummy;
 static char *  regparse;       /* Input-scan pointer. */
@@ -372,7 +372,7 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32
                    data->last_start_max = is_inf
                        ? I32_MAX : data->pos_min + data->pos_delta; 
                }
-               sv_catpvn(data->last_found, OPERAND(scan)+1, l);
+               sv_catpvn(data->last_found, (char *)(OPERAND(scan)+1), l);
                data->last_end = data->pos_min + l;
                data->pos_min += l; /* As in the first entry. */
                data->flags &= ~SF_BEFORE_EOL;
@@ -750,7 +750,7 @@ pregcomp(char *exp, char *xend, PMOP *pm)
     DEBUG_r(
        if (!colorset) {
            int i = 0;
-           char *s = getenv("TERMCAP_COLORS");
+           char *s = PerlEnv_getenv("TERMCAP_COLORS");
            
            colorset = 1;
            if (s) {
@@ -1673,7 +1673,7 @@ tryagain:
            ret = reg_node((regflags & PMf_FOLD)
                          ? ((regflags & PMf_LOCALE) ? EXACTFL : EXACTF)
                          : EXACT);
-           s = OPERAND(ret);
+           s = (char *) OPERAND(ret);
            regc(0, s++);               /* save spot for len */
            for (len = 0, p = regparse - 1;
              len < 127 && p < regxend;
@@ -1841,7 +1841,7 @@ regclass(void)
     register I32 def;
     I32 numlen;
 
-    s = opnd = OPERAND(regcode);
+    s = opnd = (char *) OPERAND(regcode);
     ret = reg_node(ANYOF);
     for (Class = 0; Class < 33; Class++)
        regc(0, s++);
@@ -2662,3 +2662,5 @@ re_croak2(const char* pat1,const char* pat2, va_alist)
     croak("%s", buf);
 }
 
+
+