X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Types.xs;h=03efb236089942a478ce22e30dc1c43d99bbfcc8;hb=10f2056e8e60beb34bab8d23b0bbd316afc9cb0b;hp=8ff68ada6755bbcc54d77beb2ffc613cbd84f68d;hpb=e0828f7e87013a889e46eaaa7c896a34e35b941e;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/Types.xs b/Types.xs
index 8ff68ad..03efb23 100644
--- a/Types.xs
+++ b/Types.xs
@@ -350,10 +350,10 @@ typedef struct {
  SV *type_pkg;
  SV *type_meth;
 #endif /* !MULTIPLICITY */
- OP *(*pp_padsv)(pTHX);
+ OP *(*old_pp_padsv)(pTHX);
 } lt_op_info;
 
-STATIC void lt_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) {
+STATIC void lt_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*old_pp_padsv)(pTHX)) {
 #define lt_map_store(O, OP, TP, TM, PP) lt_map_store(aTHX_ (O), (OP), (TP), (TM), (PP))
  lt_op_info *oi;
 
@@ -406,7 +406,7 @@ STATIC void lt_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type
  oi->type_meth = type_meth;
 #endif /* !MULTIPLICITY */
 
- oi->pp_padsv  = pp_padsv;
+ oi->old_pp_padsv = old_pp_padsv;
 
 #ifdef USE_ITHREADS
  MUTEX_UNLOCK(&lt_op_map_mutex);
@@ -509,7 +509,7 @@ STATIC OP *lt_pp_padsv(pTHX) {
    LEAVE;
   }
 
-  return CALL_FPTR(oi.pp_padsv)(aTHX);
+  return CALL_FPTR(oi.old_pp_padsv)(aTHX);
  }
 
  return CALL_FPTR(PL_ppaddr[OP_PADSV])(aTHX);
@@ -669,19 +669,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 +707,8 @@ MODULE = Lexical::Types      PACKAGE = Lexical::Types
 
 PROTOTYPES: ENABLE
 
-BOOT: 
-{                                    
+BOOT:
+{
  if (!lt_booted++) {
   HV *stash;
 
@@ -733,7 +735,7 @@ PREINIT:
  ptable *t;
  int    *level;
  SV     *cloned_default_meth;
-CODE:
+PPCODE:
  {
   my_cxt_t ud;
   dMY_CXT;
@@ -756,6 +758,7 @@ CODE:
   SAVEDESTRUCTOR_X(lt_thread_cleanup, level);
   ENTER_with_name("sub");
  }
+ XSRETURN(0);
 
 #endif