[win32] change#1060 was inexplicably missing some of the "ensure

AS stuff does no harm" fixes

p4raw-link: @1060 on //depot/win32/perl: 26ca90b622247714396690e385249f8ca1417aa0

p4raw-id: //depot/win32/perl@1065

diff --git a/embed.h b/embed.h
index cde5196..43b85d4 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -211,7 +211,6 @@
 #define get_op_descs           Perl_get_op_descs
 #define get_op_names           Perl_get_op_names
 #define get_opargs             Perl_get_opargs
-#define get_specialsv_list     Perl_get_specialsv_list
 #define gp_free                        Perl_gp_free
 #define gp_ref                 Perl_gp_ref
 #define gt_amg                 Perl_gt_amg

diff --git a/global.sym b/global.sym
index ea9a875..5279e41 100644 (file)
--- a/global.sym
+++ b/global.sym
@@ -38,7 +38,6 @@ get_op_descs
 get_op_names
 get_no_modify
 get_opargs
-get_specialsv_list
 gt_amg
 inc_amg
 init_thread_intern

diff --git a/win32/Makefile b/win32/Makefile
index 16ea34d..aa86afc 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -114,15 +114,8 @@ LIB32              = $(LINK32) -lib
 #
 # Options
 #
-!IF  "$(OBJECT)" == "-DPERL_OBJECT"
-RUNTIME                = -MT
-# XXX building with -MD fails many tests, but cannot investigate
-# because building with debug crashes compiler :-( GSAR )-:
-#RUNTIME       = -MD
-!ELSE
-RUNTIME                = -MD
-!ENDIF
 
+RUNTIME                = -MD
 INCLUDES       = -I.\include -I. -I..
 #PCHFLAGS      = -Fpc:\temp\vcmoduls.pch -YX 
 DEFINES                = -DWIN32 -D_CONSOLE $(BUILDOPT) $(CRYPT_FLAG)
@@ -145,9 +138,9 @@ OPTIMIZE    = -Od $(RUNTIME)d -Zi -D_DEBUG -DDEBUGGING
 LINK_DBG       = -debug -pdb:none
 !ELSE
 !  IF "$(CCTYPE)" == "MSVC20"
-OPTIMIZE       = -O2 $(RUNTIME) -DNDEBUG
+OPTIMIZE       = -Od $(RUNTIME) -DNDEBUG
 !  ELSE
-OPTIMIZE       = -O2 $(RUNTIME) -DNDEBUG
+OPTIMIZE       = -Od $(RUNTIME) -DNDEBUG
 !  ENDIF
 LINK_DBG       = -release
 !ENDIF
@@ -357,7 +350,7 @@ WIN32_OBJ   = $(WIN32_SRC:.c=.obj)
 MINICORE_OBJ   = $(CORE_OBJ:..\=.\mini\) $(MINIDIR)\miniperlmain$(o)
 MINIWIN32_OBJ  = $(WIN32_OBJ:.\=.\mini\)
 MINI_OBJ       = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
-PERL95_OBJ     = $(PERL95_SRC:.c=.obj) DynaLoadmt$(o)
+PERL95_OBJ     = $(PERL95_SRC:.c=.obj)
 DLL_OBJ                = $(DLL_SRC:.c=.obj)
 X2P_OBJ                = $(X2P_SRC:.c=.obj)
 
@@ -372,6 +365,7 @@ PERLEXE_OBJ = perlmain$(o)
 PERLDLL_OBJ    = $(PERLDLL_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
 !ELSE
 PERLEXE_OBJ    = $(PERLEXE_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
+PERL95_OBJ     = $(PERL95_OBJ) DynaLoadmt$(o)
 !ENDIF
 
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B

diff --git a/win32/makefile.mk b/win32/makefile.mk
index ab67c73..ec7226e 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -199,15 +199,8 @@ LIB32              = $(LINK32) -lib
 #
 # Options
 #
-.IF "$(OBJECT)" == "-DPERL_OBJECT"
-RUNTIME                = -MT
-# XXX building with -MD fails many tests, but cannot investigate
-# because building with debug crashes compiler :-( GSAR )-:
-#RUNTIME       = -MD
-.ELSE
-RUNTIME                = -MD
-.ENDIF
 
+RUNTIME                = -MD
 INCLUDES       = -I.\include -I. -I..
 #PCHFLAGS      = -Fpc:\temp\vcmoduls.pch -YX 
 DEFINES                = -DWIN32 -D_CONSOLE $(BUILDOPT) $(CRYPT_FLAG)
@@ -230,9 +223,9 @@ OPTIMIZE    = -Od $(RUNTIME)d -Zi -D_DEBUG -DDEBUGGING
 LINK_DBG       = -debug -pdb:none
 .ELSE
 .IF "$(CCTYPE)" == "MSVC20"
-OPTIMIZE       = -O2 $(RUNTIME) -DNDEBUG
+OPTIMIZE       = -Od $(RUNTIME) -DNDEBUG
 .ELSE
-OPTIMIZE       = -O2 $(RUNTIME) -DNDEBUG
+OPTIMIZE       = -Od $(RUNTIME) -DNDEBUG
 .ENDIF
 LINK_DBG       = -release
 .ENDIF
@@ -467,7 +460,7 @@ WIN32_OBJ   = $(WIN32_SRC:db:+$(o))
 MINICORE_OBJ   = $(MINIDIR)\{$(CORE_OBJ:f) miniperlmain$(o)}
 MINIWIN32_OBJ  = $(MINIDIR)\{$(WIN32_OBJ:f)}
 MINI_OBJ       = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
-PERL95_OBJ     = $(PERL95_SRC:db:+$(o)) DynaLoadmt$(o)
+PERL95_OBJ     = $(PERL95_SRC:db:+$(o))
 DLL_OBJ                = $(DLL_SRC:db:+$(o))
 X2P_OBJ                = $(X2P_SRC:db:+$(o))
 
@@ -482,6 +475,7 @@ PERLEXE_OBJ = perlmain$(o)
 PERLDLL_OBJ    += $(WIN32_OBJ) $(DLL_OBJ)
 .ELSE
 PERLEXE_OBJ    += $(WIN32_OBJ) $(DLL_OBJ)
+PERL95_OBJ     += DynaLoadmt$(o)
 .ENDIF
 
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B