Per-thread magicals now stored in their own thr->magicals and keyed

more directly. cvcache and oursv become ordinary struct thread
fields instead of #defined thr->Tfoo ones. SvREFCNT_inc now checks
for 0 again. Main thread initialisation done by new function
init_main_thread instead of (now fixed) new_struct_thread.

p4raw-id: //depot/perl@205

1 files changed, 3 insertions, 3 deletions

diff --git a/sv.h b/sv.h
index 437f4888fa..916dc17fe6 100644
--- a/sv.h
+++ b/sv.h
@@ -73,12 +73,12 @@ struct io {
 #define SvREFCNT(sv)	(sv)->sv_refcnt
 
 #ifdef __GNUC__
-#  define SvREFCNT_inc(sv)	({SV *nsv = (SV*)(sv); ++SvREFCNT(nsv); nsv;})
+#  define SvREFCNT_inc(sv) ({SV* nsv=(SV*)(sv); if(nsv) ++SvREFCNT(nsv); nsv;})
 #else
 #  if defined(CRIPPLED_CC) || defined(USE_THREADS)
-#    define SvREFCNT_inc(sv)	sv_newref((SV*)sv)
+#    define SvREFCNT_inc(sv) sv_newref((SV*)sv)
 #  else
-#    define SvREFCNT_inc(sv)	((Sv = (SV*)(sv)), ++SvREFCNT(Sv), (SV*)Sv)
+#    define SvREFCNT_inc(sv) ((Sv=(SV*)(sv)), (Sv && ++SvREFCNT(Sv)), (SV*)Sv)
 #  endif
 #endif