summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--objpp.h2
-rw-r--r--win32/Makefile2
-rw-r--r--win32/config.bc2
-rw-r--r--win32/config.gc2
-rw-r--r--win32/config.vc2
-rw-r--r--win32/makefile.mk4
6 files changed, 8 insertions, 6 deletions
diff --git a/objpp.h b/objpp.h
index 3042828a3f..5d662de607 100644
--- a/objpp.h
+++ b/objpp.h
@@ -817,6 +817,8 @@
#define newWHILEOP CPerlObj::Perl_newWHILEOP
#undef new_logop
#define new_logop CPerlObj::new_logop
+#undef new_stackinfo
+#define new_stackinfo CPerlObj::Perl_new_stackinfo
#undef new_sv
#define new_sv CPerlObj::new_sv
#undef new_xiv
diff --git a/win32/Makefile b/win32/Makefile
index ea5dd12e38..bb8b737d0d 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -118,7 +118,7 @@ RUNTIME = -MD
!ENDIF
INCLUDES = -I.\include -I. -I..
-#PCHFLAGS = -Fp"$(INTDIR)/modules.pch" -YX
+#PCHFLAGS = -Fpc:\temp\vcmoduls.pch -YX
DEFINES = -DWIN32 -D_CONSOLE $(BUILDOPT) $(CRYPT_FLAG)
LOCDEFS = -DPERLDLL -DPERL_CORE
SUBSYS = console
diff --git a/win32/config.bc b/win32/config.bc
index c395f6a882..0364c329dd 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -163,7 +163,7 @@ d_msgctl='define'
d_msgget='define'
d_msgrcv='define'
d_msgsnd='define'
-d_mymalloc='define'
+d_mymalloc='undef'
d_nice='undef'
d_oldpthreads='undef'
d_oldsock='undef'
diff --git a/win32/config.gc b/win32/config.gc
index 13f02c70d7..ec41c2ec68 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -163,7 +163,7 @@ d_msgctl='define'
d_msgget='define'
d_msgrcv='define'
d_msgsnd='define'
-d_mymalloc='define'
+d_mymalloc='undef'
d_nice='undef'
d_oldpthreads='undef'
d_oldsock='undef'
diff --git a/win32/config.vc b/win32/config.vc
index 3a3f81e90b..62cd537c78 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -163,7 +163,7 @@ d_msgctl='define'
d_msgget='define'
d_msgrcv='define'
d_msgsnd='define'
-d_mymalloc='define'
+d_mymalloc='undef'
d_nice='undef'
d_oldpthreads='undef'
d_oldsock='undef'
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 9e59de7c52..7e145467d4 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -122,7 +122,7 @@ IMPLIB = implib -c
#
RUNTIME = -D_RTLDLL
INCLUDES = -I.\include -I. -I.. -I$(CCINCDIR)
-#PCHFLAGS = -H -H$(INTDIR)\bcmoduls.pch
+#PCHFLAGS = -H -Hc -H=c:\temp\bcmoduls.pch
DEFINES = -DWIN32 $(BUILDOPT) $(CRYPT_FLAG)
LOCDEFS = -DPERLDLL -DPERL_CORE
SUBSYS = console
@@ -200,7 +200,7 @@ RUNTIME = -MD
.ENDIF
INCLUDES = -I.\include -I. -I..
-#PCHFLAGS = -Fp$(INTDIR)\vcmoduls.pch -YX
+#PCHFLAGS = -Fpc:\temp\vcmoduls.pch -YX
DEFINES = -DWIN32 -D_CONSOLE $(BUILDOPT) $(CRYPT_FLAG)
LOCDEFS = -DPERLDLL -DPERL_CORE
SUBSYS = console