summaryrefslogtreecommitdiff
path: root/sv.h
diff options
context:
space:
mode:
authorFather Chrysostomos <sprout@cpan.org>2010-09-28 23:41:43 -0700
committerFather Chrysostomos <sprout@cpan.org>2010-09-29 00:02:41 -0700
commit4e3a83657baae9e603058d075ecfcec051d04c5a (patch)
treef2285bb46dbe1c5fa0b86727719887c78d9289e3 /sv.h
parent7fdd8d84b57fd74e4b6223233f298d6a853fbaeb (diff)
downloadperl-4e3a83657baae9e603058d075ecfcec051d04c5a.tar.gz
Revert "[perl #77928] Glob slot assignment and set-magic"
This reverts commit cffb36981555111f364a511fb5763f65ea748c0e.
Diffstat (limited to 'sv.h')
-rw-r--r--sv.h18
1 files changed, 2 insertions, 16 deletions
diff --git a/sv.h b/sv.h
index 2f03bfc8d0..3be9559242 100644
--- a/sv.h
+++ b/sv.h
@@ -1949,23 +1949,9 @@ Returns a pointer to the character buffer.
SvSetSV_nosteal_and(dst,src,/*nothing*/;)
#define SvSetMagicSV(dst,src) \
- SvSetSV_and(dst,src, \
- if (SvSMAGICAL(dst) \
- && ( \
- !isGV_with_GP(dst) || !SvROK(src) || isGV_with_GP(SvRV(src)) \
- ) \
- ) \
- mg_set(dst) \
- )
+ SvSetSV_and(dst,src,SvSETMAGIC(dst))
#define SvSetMagicSV_nosteal(dst,src) \
- SvSetSV_nosteal_and(dst,src, \
- if (SvSMAGICAL(dst) \
- && ( \
- !isGV_with_GP(dst) || !SvROK(src) || isGV_with_GP(SvRV(src)) \
- ) \
- ) \
- mg_set(dst) \
- )
+ SvSetSV_nosteal_and(dst,src,SvSETMAGIC(dst))
#if !defined(SKIP_DEBUGGING)