[win32] integrate mainline

p4raw-id: //depot/win32/perl@455

diff --cc MANIFEST
index e1a7c55,2e53129..a9094bb
--- 1/MANIFEST
--- 2/MANIFEST
+++ b/MANIFEST
@@@ -737,10 -743,11 +743,13 @@@ t/lib/soundex.t         See if Soundex work
  t/lib/symbol.t                See if Symbol works
  t/lib/texttabs.t      See if Text::Tabs works
  t/lib/textwrap.t      See if Text::Wrap works
 -t/lib/timelocal.t     See if Time::Local works
 +t/lib/tie-push.t      Test for Tie::Array
 +t/lib/tie-stdarray.t  Test for Tie::StdArray
 +t/lib/tie-stdpush.t   Test for Tie::StdArray
  t/lib/thread.t                Basic test of threading (skipped if no threads) 
+ t/lib/tie-push.t      See if pushing onto tied arrays works
+ t/lib/tie-stdarray.t  See if tied arrays work
+ t/lib/tie-stdpush.t   See if pushing onto standard tied arrays works
  t/lib/trig.t          See if Math::Trig works
  t/op/append.t         See if . works
  t/op/arith.t          See if arithmetic works

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_ctl.c
Simple merge

diff --cc scope.c
Simple merge

diff --cc sv.c
index cd756a0,2ed06cd..5b37d72
--- 1/sv.c
--- 2/sv.c
+++ b/sv.c
@@@ -73,10 -73,10 +73,10 @@@ typedef void (*SVFUNC) _((SV*))
  
  #define del_SV(p)                     \
      do {                              \
-       MUTEX_LOCK(&sv_mutex);          \
+       LOCK_SV_MUTEX;                  \
        reg_remove(p);                  \
 -        free((char*)(p));             \
 +        Safefree((char*)(p));         \
-       MUTEX_UNLOCK(&sv_mutex);        \
+       UNLOCK_SV_MUTEX;                \
      } while (0)
  
  static SV **registry;

diff --cc util.c
Simple merge