Change 28159 by nicholas@nicholas-saigo on 2006/05/11 11:55:15
Integrate:
[ 24958]
Indent some of the #ifdef/#define/#endif to make the nesting clearer.
Simplify SvPV_free slightly.
[just the second part]
Affected files
//depot/maint-5.8/perl/sv.h#60 integrate
Differences
//depot/maint-5.8/perl/sv.h#60 (text)
Index: perl/sv.h
perl/sv.h#59~28157~2006-05-11 03:03:53.000000000 -0700
perl/sv.h2006-05-11 04:55:15.000000000 -0700
@@ -938,17 +938,17 @@
SvPV_renew(sv, _lEnGtH); \
} STMT_END
-#define SvPV_free(sv) \
-STMT_START { assert(SvTYPE(sv) >= SVt_PV);\
-if (SvLEN(sv)) {\
- if(SK(sv)) {\
- Safefree(SvPVX(sv) - SvIVX(sv));\
- SvFLAGS(sv) &= ~SVK;\
- } else {\
- Safefree(SvPVX(sv));\
- }\
-}\
-} STMT_END
+#define SvPV_free(sv)\
+ STMT_START {\
+ assert(SvTYPE(sv) >= SVt_PV);\
+ if (SvLEN(sv)) {\
+ if(SK(sv)) {\
+ SvPV_set(sv, SvPVX_mutable(sv) - SvIVX(sv)); \
+ SvFLAGS(sv) &= ~SVK;\
+ }\
+ Safefree(SvPVX(sv));\
+ }\
+ } STMT_END
#define BmRARE(sv)((XPVBM*) SvANY(sv))->xbm_rare
#define BmUSEFUL(sv)((XPVBM*) SvANY(sv))->xbm_useful
End of Patch.