Make sure MULTIPLICITY builds set PERL_IMPLICIT_CONTEXT

[perl/modules/indirect.git] / indirect.xs

diff --git a/indirect.xs b/indirect.xs
index 40aebea36f97c0d56e583f19220bdf70bfc58c13..d8e7d0deb9d21ebc25cbfa683a86c84e9db71af8 100644 (file)
--- a/indirect.xs
+++ b/indirect.xs
@@ -113,12 +113,17 @@
 #endif
 
 #ifndef I_MULTIPLICITY
-# if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
+# if defined(MULTIPLICITY)
 #  define I_MULTIPLICITY 1
 # else
 #  define I_MULTIPLICITY 0
 # endif
 #endif
+#if I_MULTIPLICITY
+# ifndef PERL_IMPLICIT_CONTEXT
+#  error MULTIPLICITY builds must set PERL_IMPLICIT_CONTEXT
+# endif
+#endif
 #if I_MULTIPLICITY && !defined(tTHX)
 # define tTHX PerlInterpreter*
 #endif
@@ -468,7 +473,7 @@ static SV *indirect_detag(pTHX_ const SV *hint) {
  return I_HINT_CODE(h);
 }
 
-static U32 indirect_hash = 0;
+static VOL U32 indirect_hash = 0;
 
 static SV *indirect_hint(pTHX) {
 #define indirect_hint() indirect_hint(aTHX)
@@ -935,7 +940,7 @@ done:
 
 /* --- Global setup/teardown ------------------------------------------------ */
 
-static U32 indirect_initialized = 0;
+static VOL U32 indirect_initialized = 0;
 
 static void indirect_global_teardown(pTHX_ void *root) {
  if (!indirect_initialized)