Fix up 5.004_03 merge: remove missing win32 files from MANIFEST,

add missing dTHR; to new function unwind_handler_stack() in mg.c
and bump patchlevel.h to 5.004_52.

p4raw-id: //depot/perl@115

diff --git a/MANIFEST b/MANIFEST
index e6b3b41..05da438 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -827,10 +827,6 @@ win32/Makefile             Win32 makefile for NMAKE (Visual C++ build)
 win32/TEST             Win32 port
 win32/autosplit.pl     Win32 port
 win32/bin/network.pl   Win32 port
-win32/bin/pl2bat.pl    wrap perl scripts into batch files
-win32/bin/runperl.pl   run perl script via batch file namesake
-win32/bin/search.pl    Win32 port
-win32/bin/webget.pl    Win32 port
 win32/bin/www.pl       Win32 port
 win32/config.bc                Win32 base line config.sh (Borland C++ build)
 win32/config.vc                Win32 base line config.sh (Visual C++ build)

diff --git a/mg.c b/mg.c
index 74fd983..e02a1d2 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -1698,6 +1698,7 @@ static void
 unwind_handler_stack(p)
     void *p;
 {
+    dTHR;
     U32 flags = *(U32*)p;
 
     if (flags & 1)

diff --git a/patchlevel.h b/patchlevel.h
index ddbb585..d8da982 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -1,5 +1,5 @@
 #define PATCHLEVEL 4
-#define SUBVERSION 51
+#define SUBVERSION 52
 
 /*
        local_patches -- list of locally applied less-than-subversion patches.