This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Don't even declare PL_vtbl_sigelem under -DPERL_MICRO
authorNicholas Clark <nick@ccl4.org>
Fri, 13 May 2011 10:39:18 +0000 (11:39 +0100)
committerNicholas Clark <nick@ccl4.org>
Sat, 11 Jun 2011 08:12:16 +0000 (10:12 +0200)
This turns out to be a simpler solution than 9ba75e3cf905a6e6.

dump.c
perl.h
sv.c
util.c

diff --git a/dump.c b/dump.c
index c3c07b2..273957a 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -1295,7 +1295,9 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32
             else if (v == &PL_vtbl_env)        s = "env";
             else if (v == &PL_vtbl_envelem)    s = "envelem";
             else if (v == &PL_vtbl_sig)        s = "sig";
+#ifndef PERL_MICRO
             else if (v == &PL_vtbl_sigelem)    s = "sigelem";
+#endif
             else if (v == &PL_vtbl_pack)       s = "pack";
             else if (v == &PL_vtbl_packelem)   s = "packelem";
             else if (v == &PL_vtbl_dbline)     s = "dbline";
diff --git a/perl.h b/perl.h
index facdacf..b946259 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -5185,20 +5185,7 @@ MGVTBL_SET(
     0
 );
 
-#ifdef PERL_MICRO
-MGVTBL_SET(
-    PL_vtbl_sigelem,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-);
-
-#else
+#ifndef PERL_MICRO
 MGVTBL_SET(
     PL_vtbl_sigelem,
     Perl_magic_getsig,
diff --git a/sv.c b/sv.c
index e0899ba..0e18213 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -5346,9 +5346,11 @@ Perl_sv_magic(pTHX_ register SV *const sv, SV *const obj, const int how,
     case PERL_MAGIC_sig:
        vtable = &PL_vtbl_sig;
        break;
+#ifndef PERL_MICRO
     case PERL_MAGIC_sigelem:
        vtable = &PL_vtbl_sigelem;
        break;
+#endif
     case PERL_MAGIC_taint:
        vtable = &PL_vtbl_taint;
        break;
diff --git a/util.c b/util.c
index 3428a25..ee56089 100644 (file)
--- a/util.c
+++ b/util.c
@@ -3752,9 +3752,11 @@ Perl_get_vtbl(pTHX_ int vtbl_id)
     case want_vtbl_sig:
        result = &PL_vtbl_sig;
        break;
+#ifndef PERL_MICRO
     case want_vtbl_sigelem:
        result = &PL_vtbl_sigelem;
        break;
+#endif
     case want_vtbl_pack:
        result = &PL_vtbl_pack;
        break;