Make sure MULTIPLICITY builds set PERL_IMPLICIT_CONTEXT

[perl/modules/Variable-Magic.git] / Magic.xs

diff --git a/Magic.xs b/Magic.xs
index 55ca968ca268011d3a0b25b78528e509f5091d2c..cf5bc21472701075610c731a660948e45cbc9404 100644 (file)
--- a/Magic.xs
+++ b/Magic.xs
@@ -49,12 +49,17 @@
 #endif
 
 #ifndef VMG_MULTIPLICITY
-# if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
+# if defined(MULTIPLICITY)
 #  define VMG_MULTIPLICITY 1
 # else
 #  define VMG_MULTIPLICITY 0
 # endif
 #endif
+#if VMG_MULTIPLICITY
+# ifndef PERL_IMPLICIT_CONTEXT
+#  error MULTIPLICITY builds must set PERL_IMPLICIT_CONTEXT
+# endif
+#endif
 
 #if VMG_MULTIPLICITY && defined(USE_ITHREADS) && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && (defined(MY_CXT_CLONE) || defined(dMY_CXT_SV))
 # define VMG_THREADSAFE 1
@@ -1742,7 +1747,7 @@ static I32 vmg_svt_val(pTHX_ IV action, SV *sv) {
 
 /* --- Global setup/teardown ----------------------------------------------- */
 
-static U32 vmg_initialized = 0;
+static VOL U32 vmg_initialized = 0;
 
 static void vmg_global_teardown_late(pTHX) {
 #define vmg_global_teardown_late() vmg_global_teardown_late(aTHX)