various win32 tweaks; disable new xs_cpp section (it creates

ambiguous inference graph for %.xs --> %.o)

p4raw-id: //depot/perl@2086

7 files changed, 28 insertions, 7 deletions

diff --git a/win32/GenCAPI.pl b/win32/GenCAPI.pl
index a4e409947e..5c77d70112 100644
--- a/win32/GenCAPI.pl
+++ b/win32/GenCAPI.pl
@@ -40,6 +40,7 @@ sub skip_these {
 }
 
 skip_these [qw(
+yylex
 cando
 cast_ulong
 my_chsize
diff --git a/win32/Makefile b/win32/Makefile
index 2e017292bf..d6b6ddaeb0 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -33,6 +33,11 @@ INST_VER	= \5.00552
 #USE_THREADS	= define
 
 #
+# uncomment to enable multiple interpreters
+#
+#USE_MULTI	= define
+
+#
 # uncomment next line if you are using Visual C++ 2.x
 #
 #CCTYPE		= MSVC20
@@ -135,6 +140,7 @@ CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 !IF "$(OBJECT)" != ""
 PERL_MALLOC	= undef
 USE_THREADS	= undef
+USE_MULTI	= undef
 !ENDIF
 
 !IF "$(PERL_MALLOC)" == ""
@@ -145,8 +151,11 @@ PERL_MALLOC	= undef
 USE_THREADS	= undef
 !ENDIF
 
-#BUILDOPT	= -DMULTIPLICITY 
-#BUILDOPT	= -DPERL_GLOBAL_STRUCT -DMULTIPLICITY
+!IF "$(USE_MULTI)" == ""
+USE_MULTI	= undef
+!ENDIF
+
+#BUILDOPT	= -DPERL_GLOBAL_STRUCT
 # -DUSE_PERLIO -D__STDC__=1 -DUSE_SFIO -DI_SFIO -I\sfio97\include
 
 !IF "$(PROCESSOR_ARCHITECTURE)" == ""
@@ -573,6 +582,7 @@ CFG_VARS	=					\
 		"dynamic_ext=$(DYNAMIC_EXT)"		\
 		"nonxs_ext=$(NONXS_EXT)"		\
 		"usethreads=$(USE_THREADS)"		\
+		"usemultiplicity=$(USE_MULTI)"		\
 		"LINK_FLAGS=$(LINK_FLAGS)"		\
 		"optimize=$(OPTIMIZE)"
 
diff --git a/win32/config.gc b/win32/config.gc
index 7dc64f8cdb..c4c6d1a3ae 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -594,7 +594,7 @@ uname='uname'
 uniq='uniq'
 use64bits='undef'
 usedl='define'
-usemultiplicity='undef'
+usemultiplicity='define'
 usemymalloc='n'
 usenm='false'
 useopcode='true'
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 82e5d1862f..0e178b61d7 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -2278,7 +2278,7 @@
  *	This symbol, if defined, indicates that Perl should
  *	be built to use multiplicity.
  */
-/*#define	MULTIPLICITY		/**/
+#define	MULTIPLICITY		/**/
 
 /* USE_THREADS:
  *	This symbol, if defined, indicates that Perl should
diff --git a/win32/makedef.pl b/win32/makedef.pl
index 222ce06e7e..80ea5e3947 100644
--- a/win32/makedef.pl
+++ b/win32/makedef.pl
@@ -28,6 +28,7 @@ while (<CFG>)
  {
   $define{$1} = 1 if /^\s*#\s*define\s+(MYMALLOC)\b/;
   $define{$1} = 1 if /^\s*#\s*define\s+(USE_THREADS)\b/;
+  $define{$1} = 1 if /^\s*#\s*define\s+(MULTIPLICITY)\b/;
  }
 close(CFG);
 
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 07fcad0c23..d12add705b 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -37,6 +37,11 @@ INST_VER	*= \5.00552
 #USE_THREADS	*= define
 
 #
+# uncomment to enable multiple interpreters
+#
+#USE_MULTI	*= define
+
+#
 # uncomment one
 #
 #CCTYPE		*= MSVC20
@@ -153,14 +158,15 @@ CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 .IF "$(OBJECT)" != ""
 PERL_MALLOC	!= undef
 USE_THREADS	!= undef
+USE_MULTI	!= undef
 .ENDIF
 
 PERL_MALLOC	*= undef
 
 USE_THREADS	*= undef
+USE_MULTI	*= undef
 
-#BUILDOPT	*= -DMULTIPLICITY 
-#BUILDOPT	*= -DPERL_GLOBAL_STRUCT -DMULTIPLICITY 
+#BUILDOPT	*= -DPERL_GLOBAL_STRUCT
 # -DUSE_PERLIO -D__STDC__=1 -DUSE_SFIO -DI_SFIO -I\sfio97\include
 
 .IMPORT .IGNORE : PROCESSOR_ARCHITECTURE
@@ -693,6 +699,7 @@ CFG_VARS	=					\
 		"dynamic_ext=$(DYNAMIC_EXT)"		\
 		"nonxs_ext=$(NONXS_EXT)"		\
 		"usethreads=$(USE_THREADS)"		\
+		"usemultiplicity=$(USE_MULTI)"		\
 		"LINK_FLAGS=$(LINK_FLAGS)"		\
 		"optimize=$(OPTIMIZE)"
 
diff --git a/win32/win32.h b/win32/win32.h
index 8b789fd180..b52ef4eb80 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -32,7 +32,9 @@ typedef long long __int64;
 #endif
 #  ifndef PERL_OBJECT
 #    define PERL_GLOBAL_STRUCT
-#    define MULTIPLICITY
+#    ifndef MULTIPLICITY
+#      define MULTIPLICITY
+#    endif
 #  endif
 #endif