summaryrefslogtreecommitdiff
path: root/sv.h
diff options
context:
space:
mode:
authorJan Dubois <jand@activestate.com>1999-01-24 02:12:00 +0100
committerGurusamy Sarathy <gsar@cpan.org>1999-02-12 13:25:59 +0000
commit9e7bc3e8c0a5a5a357a2bda9981a86c5a61092c1 (patch)
treedc6c1d0c460cd55c7d2b7b74378919964cf50799 /sv.h
parent01e22528c2c3f941ba946b303423dfa59ea39444 (diff)
downloadperl-9e7bc3e8c0a5a5a357a2bda9981a86c5a61092c1.tar.gz
remove OVERLOAD conditionals
Message-ID: <36b66479.62756298@smtp1.ibm.net> p4raw-id: //depot/perl@2903
Diffstat (limited to 'sv.h')
-rw-r--r--sv.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/sv.h b/sv.h
index 7884aeb332..a08a9c8239 100644
--- a/sv.h
+++ b/sv.h
@@ -147,11 +147,7 @@ struct io {
#define SVf_OK (SVf_IOK|SVf_NOK|SVf_POK|SVf_ROK| \
SVp_IOK|SVp_NOK|SVp_POK)
-#ifdef OVERLOAD
-#define SVf_AMAGIC 0x10000000 /* has magical overloaded methods */
-#else
-#define SVf_AMAGIC 0 /* can be or-ed without effect */
-#endif /* OVERLOAD */
+#define SVf_AMAGIC 0x10000000 /* has magical overloaded methods */
#define PRIVSHIFT 8
@@ -384,10 +380,9 @@ struct xpvio {
#define SvRMAGICAL_on(sv) (SvFLAGS(sv) |= SVs_RMG)
#define SvRMAGICAL_off(sv) (SvFLAGS(sv) &= ~SVs_RMG)
-#ifdef OVERLOAD
-#define SvAMAGIC(sv) (SvFLAGS(sv) & SVf_AMAGIC)
-#define SvAMAGIC_on(sv) (SvFLAGS(sv) |= SVf_AMAGIC)
-#define SvAMAGIC_off(sv) (SvFLAGS(sv) &= ~SVf_AMAGIC)
+#define SvAMAGIC(sv) (SvFLAGS(sv) & SVf_AMAGIC)
+#define SvAMAGIC_on(sv) (SvFLAGS(sv) |= SVf_AMAGIC)
+#define SvAMAGIC_off(sv) (SvFLAGS(sv) &= ~SVf_AMAGIC)
/*
#define Gv_AMG(stash) \
@@ -395,7 +390,6 @@ struct xpvio {
((!HV_AMAGICbad(stash) && HV_AMAGIC(stash)) || Gv_AMupdate(stash)))
*/
#define Gv_AMG(stash) (PL_amagic_generation && Gv_AMupdate(stash))
-#endif /* OVERLOAD */
#define SvTHINKFIRST(sv) (SvFLAGS(sv) & SVf_THINKFIRST)