X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Types.xs;h=0a13cdb88caf7c94517d61d6188349c1e15a604c;hb=34f54f87c254e212ef4db5d29937471be325d2b8;hp=47f822274b0e001167923041bd8bc0cf4d8fbeda;hpb=6f58548bdd94477177ad27890b9d9f2f3e6cd42d;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/Types.xs b/Types.xs
index 47f8222..0a13cdb 100644
--- a/Types.xs
+++ b/Types.xs
@@ -39,12 +39,18 @@
 # define SvREFCNT_inc_simple_NN SvREFCNT_inc
 #endif
 
-#ifndef ENTER_with_name
-# define ENTER_with_name(N) ENTER
+#undef ENTERn
+#if defined(ENTER_with_name) && !LT_HAS_PERL(5, 11, 4)
+# define ENTERn(N) ENTER_with_name(N)
+#else
+# define ENTERn(N) ENTER
 #endif
 
-#ifndef LEAVE_with_name
-# define LEAVE_with_name(N) LEAVE
+#undef LEAVEn
+#if defined(LEAVE_with_name) && !LT_HAS_PERL(5, 11, 4)
+# define LEAVEn(N) LEAVE_with_name(N)
+#else
+# define LEAVEn(N) LEAVE
 #endif
 
 /* ... Thread safety and multiplicity ...................................... */
@@ -669,19 +675,21 @@ STATIC void lt_teardown(pTHX_ void *root) {
  lt_initialized = 0;
 }
 
-STATIC lt_setup(pTHX) {
+STATIC void lt_setup(pTHX) {
 #define lt_setup() lt_setup(aTHX)
  if (lt_initialized)
   return;
 
- MY_CXT_INIT;
+ {
+  MY_CXT_INIT;
 #if LT_THREADSAFE
- MY_CXT.tbl            = ptable_new();
- MY_CXT.owner          = aTHX;
+  MY_CXT.tbl            = ptable_new();
+  MY_CXT.owner          = aTHX;
 #endif
- MY_CXT.pp_padsv_saved = 0;
- MY_CXT.default_meth   = newSVpvn("TYPEDSCALAR", 11);
- SvREADONLY_on(MY_CXT.default_meth);
+  MY_CXT.pp_padsv_saved = 0;
+  MY_CXT.default_meth   = newSVpvn("TYPEDSCALAR", 11);
+  SvREADONLY_on(MY_CXT.default_meth);
+ }
 
  lt_old_ck_padany    = PL_check[OP_PADANY];
  PL_check[OP_PADANY] = MEMBER_TO_FPTR(lt_ck_padany);
@@ -705,8 +713,8 @@ MODULE = Lexical::Types      PACKAGE = Lexical::Types
 
 PROTOTYPES: ENABLE
 
-BOOT: 
-{                                    
+BOOT:
+{
  if (!lt_booted++) {
   HV *stash;
 
@@ -733,7 +741,7 @@ PREINIT:
  ptable *t;
  int    *level;
  SV     *cloned_default_meth;
-CODE:
+PPCODE:
  {
   my_cxt_t ud;
   dMY_CXT;
@@ -752,10 +760,11 @@ CODE:
  {
   level = PerlMemShared_malloc(sizeof *level);
   *level = 1;
-  LEAVE_with_name("sub");
+  LEAVEn("sub");
   SAVEDESTRUCTOR_X(lt_thread_cleanup, level);
-  ENTER_with_name("sub");
+  ENTERn("sub");
  }
+ XSRETURN(0);
 
 #endif