win32 fixes for VC 6.0 nits

p4raw-id: //depot/perl@1435

diff --git a/ext/Data/Dumper/Dumper.xs b/ext/Data/Dumper/Dumper.xs
index 001a1f8..07e82d5 100644 (file)
--- a/ext/Data/Dumper/Dumper.xs
+++ b/ext/Data/Dumper/Dumper.xs
@@ -1,12 +1,6 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
-#ifdef __cplusplus
-}
-#endif
 
 static SV      *freezer;
 static SV      *toaster;

diff --git a/win32/Makefile b/win32/Makefile
index c6ce6b6..4db5414 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -164,7 +164,7 @@ LIB32               = $(LINK32) -lib
 RUNTIME                = -MD
 INCLUDES       = -I.\include -I. -I..
 #PCHFLAGS      = -Fpc:\temp\vcmoduls.pch -YX 
-DEFINES                = -DWIN32 -D_CONSOLE $(BUILDOPT) $(CRYPT_FLAG)
+DEFINES                = -DWIN32 -D_CONSOLE -DNO_STRICT $(BUILDOPT) $(CRYPT_FLAG)
 LOCDEFS                = -DPERLDLL -DPERL_CORE
 SUBSYS         = console
 CXX_FLAG       = -TP -GX

diff --git a/win32/makefile.mk b/win32/makefile.mk
index dd03ae2..89477da 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -252,7 +252,7 @@ LIB32               = $(LINK32) -lib
 RUNTIME                = -MD
 INCLUDES       = -I.\include -I. -I..
 #PCHFLAGS      = -Fpc:\temp\vcmoduls.pch -YX 
-DEFINES                = -DWIN32 -D_CONSOLE $(BUILDOPT) $(CRYPT_FLAG)
+DEFINES                = -DWIN32 -D_CONSOLE -DNO_STRICT $(BUILDOPT) $(CRYPT_FLAG)
 LOCDEFS                = -DPERLDLL -DPERL_CORE
 SUBSYS         = console
 CXX_FLAG       = -TP -GX

diff --git a/win32/win32.h b/win32/win32.h
index c251a31..76052ed 100644 (file)
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -79,6 +79,7 @@ struct tms {
 };
 
 #ifndef START_EXTERN_C
+#undef EXTERN_C
 #ifdef __cplusplus
 #  define START_EXTERN_C extern "C" {
 #  define END_EXTERN_C }