Also test cloning in t/09-load-threads.t

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

diff --git a/Magic.xs b/Magic.xs
index 947ae72a0246b945f2759deaaa5cbff9afe43382..9eda482e03a65e3652c7732e63b921a0386b47da 100644 (file)
--- a/Magic.xs
+++ b/Magic.xs
@@ -62,7 +62,9 @@
 #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
+# ifndef VMG_THREADSAFE
+#  define VMG_THREADSAFE 1
+# endif
 # ifndef MY_CXT_CLONE
 #  define MY_CXT_CLONE \
     dMY_CXT_SV;                                                      \
@@ -71,6 +73,7 @@
     sv_setuv(my_cxt_sv, PTR2UV(my_cxtp))
 # endif
 #else
+# undef  VMG_THREADSAFE
 # define VMG_THREADSAFE 0
 # undef  dMY_CXT
 # define dMY_CXT      dNOOP
@@ -1836,14 +1839,9 @@ static signed char vmg_destruct_level(pTHX) {
 
 #endif /* VMG_THREADSAFE */
 
-static void vmg_teardown(pTHX_ void *interp) {
+static void vmg_teardown(pTHX_ void *param) {
  dMY_CXT;
 
-#if VMG_MULTIPLICITY
- if (aTHX != interp)
-  return;
-#endif
-
 #if VMG_THREADSAFE
  VMG_LOADED_LOCK;
 
@@ -1934,11 +1932,7 @@ static void vmg_setup(pTHX) {
  newCONSTSUB(stash, "VMG_OP_INFO_NAME",    newSVuv(VMG_OP_INFO_NAME));
  newCONSTSUB(stash, "VMG_OP_INFO_OBJECT",  newSVuv(VMG_OP_INFO_OBJECT));
 
-#if VMG_MULTIPLICITY
- call_atexit(vmg_teardown, aTHX);
-#else
  call_atexit(vmg_teardown, NULL);
-#endif
 
  return;
 }