Skip another file in the VERSION comparison program

[p5sagit/p5-mst-13.2.git] / sv.h

diff --git a/sv.h b/sv.h
index 615e9c2..f6f1c2b 100644 (file)
--- a/sv.h
+++ b/sv.h
@@ -421,7 +421,7 @@ union _xnvu {
 
 union _xivu {
     IV     xivu_iv;            /* integer value */
-                               /* xpvfm: pv offset */
+                               /* xpvfm: lines */
     UV     xivu_uv;
     void *  xivu_p1;
     I32            xivu_i32;
@@ -522,14 +522,12 @@ struct xpvfm {
     _XPV_HEAD;
     _XPVMG_HEAD;
     _XPVCV_COMMON;
-    IV         xfm_lines;
 };
 
 typedef struct {
     _XPV_ALLOCATED_HEAD;
     _XPVMG_HEAD;
     _XPVCV_COMMON;
-    IV         xfm_lines;
 } xpvfm_allocated;
 
 #define _XPVIO_TAIL                                                    \
@@ -1094,6 +1092,7 @@ the scalar's value cannot change unless written to.
            assert(SvTYPE(_svivx) != SVt_PVAV);                         \
            assert(SvTYPE(_svivx) != SVt_PVHV);                         \
            assert(SvTYPE(_svivx) != SVt_PVCV);                         \
+           assert(SvTYPE(_svivx) != SVt_PVFM);                         \
            assert(!isGV_with_GP(_svivx));                              \
            &(((XPVIV*) SvANY(_svivx))->xiv_iv);                        \
         }))
@@ -1103,6 +1102,7 @@ the scalar's value cannot change unless written to.
            assert(SvTYPE(_svuvx) != SVt_PVAV);                         \
            assert(SvTYPE(_svuvx) != SVt_PVHV);                         \
            assert(SvTYPE(_svuvx) != SVt_PVCV);                         \
+           assert(SvTYPE(_svuvx) != SVt_PVFM);                         \
            assert(!isGV_with_GP(_svuvx));                              \
            &(((XPVUV*) SvANY(_svuvx))->xuv_uv);                        \
         }))
@@ -1232,7 +1232,7 @@ the scalar's value cannot change unless written to.
                (((XPV*)  SvANY(sv))->xpv_len = (val)); } STMT_END
 #define SvEND_set(sv, val) \
        STMT_START { assert(SvTYPE(sv) >= SVt_PV); \
-               (SvCUR(sv) = (val) - SvPVX(sv)); } STMT_END
+               SvCUR_set(sv, (val) - SvPVX(sv)); } STMT_END
 
 #define SvPV_renew(sv,n) \
        STMT_START { SvLEN_set(sv, n); \
@@ -1315,7 +1315,7 @@ the scalar's value cannot change unless written to.
 
 #endif
 
-#define FmLINES(sv)    ((XPVFM*)  SvANY(sv))->xfm_lines
+#define FmLINES(sv)    ((XPVFM*)  SvANY(sv))->xiv_u.xivu_iv
 
 #define LvTYPE(sv)     ((XPVLV*)  SvANY(sv))->xlv_type
 #define LvTARG(sv)     ((XPVLV*)  SvANY(sv))->xlv_targ