diff options
| author | Nicholas Clark <nick@ccl4.org> | 2005-09-21 09:53:54 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2005-09-21 09:53:54 +0000 |
| commit | db1c9db146911fadd4c4cfde0852e7b5879d5ee0 (patch) | |
| tree | 492e52cbbce5874141f7500b63ec8897f8c4dce3 /mg.h | |
| parent | 291a7e7465d28d12843b3117234c65e340d91995 (diff) | |
| download | perl-db1c9db146911fadd4c4cfde0852e7b5879d5ee0.tar.gz | |
Integrate:
[ 24760]
Nuke some more n_a, and convert S_gv_ename from char * to const char *
[ 24761]
Add and use MgPV_nolen_const
[ 24762]
Remove the n_a
[ 24763]
Remove repeated C<n_a>s
p4raw-link: @24763 on //depot/perl: dd720ed54afb972b0d1e09663193b36f0d1e05d1
p4raw-link: @24762 on //depot/perl: 4b1c440c100c9148ae3a9da3f948d4f8f85d88c2
p4raw-link: @24761 on //depot/perl: 01b8bcb77a033a072e6afd95c46cef74d30628c1
p4raw-link: @24760 on //depot/perl: 8b6b16e72bf4dd30bd09781ad50e9f66fd94440b
p4raw-id: //depot/maint-5.8/perl@25527
p4raw-integrated: from //depot/perl@25525 'copy in' malloc.c (@24689..)
mg.h (@24738..)
p4raw-integrated: from //depot/perl@24763 'merge in' perl.c (@24758..)
p4raw-integrated: from //depot/perl@24760 'edit in' op.c (@24735..)
mg.c (@24755..) 'merge in' taint.c (@24445..) doop.c pp_pack.c
toke.c (@24744..) dump.c regcomp.c (@24755..) pp_hot.c
(@24756..) pp_sys.c (@24758..) embed.fnc proto.h (@24759..)
Diffstat (limited to 'mg.h')
| -rw-r--r-- | mg.h | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -48,8 +48,11 @@ struct magic { #define MgPV(mg,lp) ((((int)(lp = (mg)->mg_len)) == HEf_SVKEY) ? \ SvPV((SV*)((mg)->mg_ptr),lp) : \ (mg)->mg_ptr) -#define MgPV_const(mg,lp) ((((int)(lp = (mg)->mg_len)) == HEf_SVKEY) ? \ - SvPV_const((SV*)((mg)->mg_ptr),lp) : \ +#define MgPV_const(mg,lp) ((((int)(lp = (mg)->mg_len)) == HEf_SVKEY) ? \ + SvPV_const((SV*)((mg)->mg_ptr),lp) : \ + (const char*)(mg)->mg_ptr) +#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ + SvPV_nolen_const((SV*)((mg)->mg_ptr)) : \ (const char*)(mg)->mg_ptr) #define SvTIED_mg(sv,how) \ |