summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Dyck <david.dyck@fluke.com>2005-04-20 09:35:55 -0700
committerDave Mitchell <davem@fdisolutions.com>2005-04-20 23:56:18 +0000
commit9ba75e3cf905a6e617107b2c32c44744529e7a65 (patch)
tree937725d4f06f1c18f2184410cc5e69ce7e7f947b
parente6c138cdb74ffbd3706f86d6768c25df4ba08689 (diff)
downloadperl-9ba75e3cf905a6e617107b2c32c44744529e7a65.tar.gz
patch to [PATCH] Fix MGVTBL structures in perl.h (preprocessor
Message-Id: <Pine.LNX.4.62.0504201627550.27786@dd.tc.fluke.com> fix nits in change #24264: some preprocessors don't like #ifdefs within a macro's args; also removed duplicate semicolons from macro definitions. p4raw-link: @24264 on //depot/perl: 4944113acaf494b4518ba93648e0a4276c34a175 p4raw-id: //depot/perl@24268
-rw-r--r--perl.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/perl.h b/perl.h
index 913817dc79..c867ab264c 100644
--- a/perl.h
+++ b/perl.h
@@ -3789,9 +3789,9 @@ END_EXTERN_C
START_EXTERN_C
#ifdef DOINIT
-# define MGVTBL_SET(var,a,b,c,d,e,f,g) EXT MGVTBL var = {a,b,c,d,e,f,g};
+# define MGVTBL_SET(var,a,b,c,d,e,f,g) EXT MGVTBL var = {a,b,c,d,e,f,g}
#else
-# define MGVTBL_SET(var,a,b,c,d,e,f,g) EXT MGVTBL var;
+# define MGVTBL_SET(var,a,b,c,d,e,f,g) EXT MGVTBL var
#endif
MGVTBL_SET(
@@ -3838,11 +3838,15 @@ MGVTBL_SET(
NULL
);
+#ifdef PERL_MICRO
MGVTBL_SET(
PL_vtbl_sigelem,
-#ifdef PERL_MICRO
NULL, NULL, NULL, NULL, NULL, NULL, NULL
+);
+
#else
+MGVTBL_SET(
+ PL_vtbl_sigelem,
MEMBER_TO_FPTR(Perl_magic_getsig),
MEMBER_TO_FPTR(Perl_magic_setsig),
NULL,
@@ -3850,8 +3854,8 @@ MGVTBL_SET(
NULL,
NULL,
NULL
-#endif
);
+#endif
MGVTBL_SET(
PL_vtbl_pack,