misc win32 fixes

	Subject: [PATCH 5.004_66]
	Message-ID: <001a01bd949d$8fd18050$a32fa8c0@tau.Active>

p4raw-id: //depot/perl@1116

diff --git a/ObjXSub.h b/ObjXSub.h
index 183e87a..d1a07ca 100644 (file)
--- a/ObjXSub.h
+++ b/ObjXSub.h
@@ -1,7 +1,6 @@
 #ifndef __ObjXSub_h__
 #define __ObjXSub_h__
 
-
 /* Varibles */ 
 #undef  Argv
 #define Argv                   pPerl->Perl_Argv
@@ -41,6 +40,8 @@
 #define argvgv                 pPerl->Perl_argvgv
 #undef  argvoutgv
 #define argvoutgv              pPerl->Perl_argvoutgv
+#undef  av_fetch_sv
+#define av_fetch_sv         pPerl->av_fetch_sv
 #undef  basetime
 #define basetime               pPerl->Perl_basetime
 #undef  beginav
@@ -177,6 +178,10 @@
 #define eval_start             pPerl->Perl_eval_start
 #undef  evalseq
 #define evalseq                        pPerl->Perl_evalseq
+#undef  exitlist
+#define exitlist            pPerl->exitlist
+#undef  exitlistlen
+#define exitlistlen         pPerl->exitlistlen
 #undef  expect
 #define expect                 pPerl->Perl_expect
 #undef  extralen
@@ -207,6 +212,10 @@
 #define hexdigit               pPerl->Perl_hexdigit
 #undef  hints
 #define hints                  pPerl->Perl_hints
+#undef  hv_fetch_ent_mh
+#define hv_fetch_ent_mh     pPerl->hv_fetch_ent_mh
+#undef  hv_fetch_sv
+#define hv_fetch_sv         pPerl->hv_fetch_sv
 #undef  in_clean_all
 #define in_clean_all           pPerl->Perl_in_clean_all
 #undef  in_clean_objs
@@ -331,6 +340,8 @@
 #define minus_p                        pPerl->Perl_minus_p
 #undef  modcount
 #define modcount               pPerl->Perl_modcount
+#undef  modglobal
+#define modglobal       pPerl->Perl_modglobal
 #undef  multi_close
 #define multi_close            pPerl->Perl_multi_close
 #undef  multi_end
@@ -605,6 +616,8 @@
 #define sv_undef               pPerl->Perl_sv_undef
 #undef  sv_yes
 #define sv_yes                 pPerl->Perl_sv_yes
+#undef  svref_mutex
+#define svref_mutex         pPerl->svref_mutex
 #undef  sys_intern
 #define sys_intern             pPerl->Perl_sys_intern
 #undef  tainted

diff --git a/perl.c b/perl.c
index a72264c..9d70377 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -603,7 +603,10 @@ CPerlObj::perl_atexit(void (*fn) (CPerlObj*,void *), void *ptr)
 perl_atexit(void (*fn) (void *), void *ptr)
 #endif
 {
-    Renew(exitlist, exitlistlen+1, PerlExitListEntry);
+    if(exitlist)
+       Renew(exitlist, exitlistlen+1, PerlExitListEntry);
+    else
+       New(999, exitlist, 1, PerlExitListEntry);
     exitlist[exitlistlen].fn = fn;
     exitlist[exitlistlen].ptr = ptr;
     ++exitlistlen;

diff --git a/win32/Makefile b/win32/Makefile
index 72c4b87..7ea64cb 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -612,7 +612,7 @@ PerlCAPI.cpp : $(MINIPERL)
        $(MINIPERL) GenCAPI.pl $(COREDIR)
 
 PerlCAPI$(o) : PerlCAPI.cpp
-       $(CC) $(CFLAGS_O) -MT -UPERLDLL -DWIN95FIX -c \
+       $(CC) $(CFLAGS_O) $(RUNTIME) -UPERLDLL -c \
            $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp
 
 $(CAPILIB) : PerlCAPI.cpp PerlCAPI$(o)

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 0ef2aaa..39b0b10 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -779,7 +779,7 @@ PerlCAPI$(o) : PerlCAPI.cpp
 .ELIF "$(CCTYPE)" == "GCC"
        $(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp
 .ELSE
-       $(CC) $(CFLAGS_O) -MT -UPERLDLL -DWIN95FIX -c \
+       $(CC) $(CFLAGS_O) $(RUNTIME) -UPERLDLL -c \
            $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp
 .ENDIF