Took out mystack_foo for good, fixed up interp.sym and win32/makedef.pl

p4raw-id: //depot/perl@117

diff --git a/Todo.5.005 b/Todo.5.005
index 4bb732c..34bb322 100644 (file)
--- a/Todo.5.005
+++ b/Todo.5.005
@@ -6,7 +6,6 @@ Merging
 
 Multi-threading
     without USE_THREADS, change extern variable for dTHR
-    sv_mutex initialisation and race
     consistent semantics for exit/die in threads
     pp_entersub still cloning XSUBs (broken)?
     test '~'-magic thread addresses
@@ -18,7 +17,6 @@ Multi-threading
     more Configure support
 
 Miscellaneous
-    sv_bless3 and '~'-magic to give choice on reblessing
     rename and alter ISA.pm
 
 Compiler

diff --git a/embed.h b/embed.h
index 824f933..a824b0a 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -993,6 +993,7 @@
 #define sig_name               Perl_sig_name
 #define sig_num                        Perl_sig_num
 #define sighandler             Perl_sighandler
+#define sighandlerp            Perl_sighandlerp
 #define simple                 Perl_simple
 #define sin_amg                        Perl_sin_amg
 #define skipspace              Perl_skipspace
@@ -1024,7 +1025,6 @@
 #define sv_add_arena           Perl_sv_add_arena
 #define sv_backoff             Perl_sv_backoff
 #define sv_bless               Perl_sv_bless
-#define sv_bless3              Perl_sv_bless3
 #define sv_catpv               Perl_sv_catpv
 #define sv_catpvf              Perl_sv_catpvf
 #define sv_catpvn              Perl_sv_catpvn
@@ -1296,10 +1296,6 @@
 #define minus_n                        (curinterp->Iminus_n)
 #define minus_p                        (curinterp->Iminus_p)
 #define multiline              (curinterp->Imultiline)
-#define mystack_base           (curinterp->Imystack_base)
-#define mystack_mark           (curinterp->Imystack_mark)
-#define mystack_max            (curinterp->Imystack_max)
-#define mystack_sp             (curinterp->Imystack_sp)
 #define mystrk                 (curinterp->Imystrk)
 #define nrs                    (curinterp->Inrs)
 #define ofmt                   (curinterp->Iofmt)
@@ -1451,10 +1447,6 @@
 #define Iminus_n               minus_n
 #define Iminus_p               minus_p
 #define Imultiline             multiline
-#define Imystack_base          mystack_base
-#define Imystack_mark          mystack_mark
-#define Imystack_max           mystack_max
-#define Imystack_sp            mystack_sp
 #define Imystrk                        mystrk
 #define Inrs                   nrs
 #define Iofmt                  ofmt
@@ -1615,10 +1607,6 @@
 #define minus_n                        Perl_minus_n
 #define minus_p                        Perl_minus_p
 #define multiline              Perl_multiline
-#define mystack_base           Perl_mystack_base
-#define mystack_mark           Perl_mystack_mark
-#define mystack_max            Perl_mystack_max
-#define mystack_sp             Perl_mystack_sp
 #define mystrk                 Perl_mystrk
 #define nrs                    Perl_nrs
 #define ofmt                   Perl_ofmt

diff --git a/interp.sym b/interp.sym
index 7da031c..00eee65 100644 (file)
--- a/interp.sym
+++ b/interp.sym
@@ -87,10 +87,6 @@ minus_l
 minus_n
 minus_p
 multiline
-mystack_base
-mystack_mark
-mystack_max
-mystack_sp
 mystrk
 nrs
 ofmt

diff --git a/perl.h b/perl.h
index 62623af..99a027c 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -1926,11 +1926,6 @@ IEXT I32 Irunlevel;
 /* stack stuff */
 IEXT AV *      Icurstack;              /* THE STACK */
 IEXT AV *      Imainstack;     /* the stack when nothing funny is happening */
-#if 0
-IEXT SV **     Imystack_base;  /* stack->array_ary */
-IEXT SV **     Imystack_sp;    /* stack pointer now */
-IEXT SV **     Imystack_max;   /* stack->array_ary + stack->array_max */
-#endif
 
 /* format accumulators */
 IEXT SV *      Iformtarget;

diff --git a/win32/makedef.pl b/win32/makedef.pl
index b4883cc..04e6fd9 100644 (file)
--- a/win32/makedef.pl
+++ b/win32/makedef.pl
@@ -136,6 +136,11 @@ Perl_my_memcmp
 Perl_my_memset
 Perl_cshlen
 Perl_cshname
+Perl_condpair_magic
+Perl_magic_mutexfree
+Perl_opsave
+Perl_unlock_condpair
+Perl_vtbl_mutex
 !END!OF!SKIP!
 
 # All symbols have a Perl_ prefix because that's what embed.h