[asperl] integrate latest win32 branch

p4raw-id: //depot/asperl@569

diff --cc XSUB.h
Simple merge

diff --cc global.sym
Simple merge

diff --cc op.c
Simple merge

diff --cc perl.c
Simple merge

diff --cc perl.h
Simple merge

diff --cc pp.c
Simple merge

diff --cc pp_sys.c
Simple merge

diff --cc regcomp.c
index 363a14b,7411b8a..fc6b131
--- 1/regcomp.c
--- 2/regcomp.c
+++ b/regcomp.c
@@@ -162,8 -182,9 +162,9 @@@ static scan_data_t zero_scan_data = { 0
  #define SF_HAS_PAR            0x80
  #define SF_IN_PAR             0x100
  #define SF_HAS_EVAL           0x200
+ #define SCF_DO_SUBSTR         0x400
  
 -static void
 +STATIC void
  scan_commit(scan_data_t *data)
  {
      STRLEN l = SvCUR(data->last_found);

diff --cc sv.c
index 93fcaa6,0edfdb2..a4d72bc
--- 1/sv.c
--- 2/sv.c
+++ b/sv.c
@@@ -2297,18 -2293,16 +2299,16 @@@ sv_usepvn_mg(register SV *sv, register 
      SvSETMAGIC(sv);
  }
  
 -static void
 +STATIC void
  sv_check_thinkfirst(register SV *sv)
  {
-     if (SvTHINKFIRST(sv)) {
-       if (SvREADONLY(sv)) {
-           dTHR;
-           if (curcop != &compiling)
-               croak(no_modify);
-       }
-       if (SvROK(sv))
-           sv_unref(sv);
+     if (SvREADONLY(sv)) {
+       dTHR;
+       if (curcop != &compiling)
+           croak(no_modify);
      }
+     if (SvROK(sv))
+       sv_unref(sv);
  }
      
  void

diff --cc win32/Makefile
Simple merge

diff --cc win32/makefile.mk
Simple merge

diff --cc win32/win32.h
Simple merge

diff --cc win32/win32iop.h
Simple merge