Disable thread safety for 5.8.x on Windows

diff --git a/Magic.xs b/Magic.xs
index 2883f000dc47dc5cebbbee796668d8a32887dd54..3622e9031d715785621310644fcdc6d6e52d3c3e 100644 (file)
--- a/Magic.xs
+++ b/Magic.xs
@@ -38,13 +38,15 @@
 # define dNOOP
 #endif
 
-#if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
-# define VMG_MULTIPLICITY 1
-# ifndef tTHX
-#  define tTHX PerlInterpreter*
+#ifndef VMG_MULTIPLICITY
+# if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
+#  define VMG_MULTIPLICITY 1
+# else
+#  define VMG_MULTIPLICITY 0
 # endif
-#else
-# define VMG_MULTIPLICITY 0
+#endif
+#if VMG_MULTIPLICITY && !defined(tTHX)
+# define tTHX PerlInterpreter*
 #endif
 
 #if VMG_MULTIPLICITY && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && (defined(MY_CXT_CLONE) || defined(dMY_CXT_SV))

diff --git a/Makefile.PL b/Makefile.PL
index 18cf91c623b66975a8156c9ce7b1adb86c3b014a..cc205cb78a6f7369ed9e82eb3af02b66937d0fe8 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -37,6 +37,11 @@ if ($^O eq 'MSWin32' && $^V ge v5.8.7 && $^V lt v5.9.0) {
 }
 print $is_as ? "yes\n" : "no\n";
 
+# Threads, Windows and 5.8.x don't seem to be best friends
+if ($^O eq 'MSWin32' && $^V lt v5.9.0) {
+ push @DEFINES, '-DVMG_MULTIPLICITY=0';
+}
+
 @DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES;
 
 my $BUILD_REQUIRES = {