-Wall is intolerably noisy with icc.

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

diff --git a/sv.h b/sv.h
index bfc4778..69aad46 100644 (file)
--- a/sv.h
+++ b/sv.h
@@ -280,7 +280,14 @@ struct xpv {
     STRLEN     xpv_len;        /* allocated size */
 };
 
+#if 0
 typedef struct xpv xpv_allocated;
+#else
+typedef struct {
+    STRLEN     xpv_cur;        /* length of sv_pv as a C string */
+    STRLEN     xpv_len;        /* allocated size */
+} xpv_allocated;
+#endif
 
 struct xpviv {
     IV         xiv_iv;         /* integer value or pv offset */
@@ -299,7 +306,6 @@ struct xpvnv {
     STRLEN     xpv_cur;        /* length of sv_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */
     union {
-       NV      xnvu_nv;        /* numeric value, if any */
        struct {
            void *xnv_p1;
            union {
@@ -307,6 +313,7 @@ struct xpvnv {
                IV xnv_i2;
            }   xnv_u2;
        }       xnv_s;
+       NV      xnvu_nv;        /* numeric value, if any */
     }          xnv_u;
 };
 
@@ -318,7 +325,6 @@ struct xpvmg {
     STRLEN     xpv_cur;        /* length of sv_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */
     union {
-       NV      xnvu_nv;        /* numeric value, if any */
        struct {
            void *xnv_p1;
            union {
@@ -326,6 +332,7 @@ struct xpvmg {
                IV xnv_i2;
            }   xnv_u2;
        }       xnv_s;
+       NV      xnvu_nv;        /* numeric value, if any */
     }          xnv_u;
     MAGIC*     xmg_magic;      /* linked list of magicalness */
     HV*                xmg_stash;      /* class package */
@@ -336,7 +343,6 @@ struct xpvlv {
     STRLEN     xpv_cur;        /* length of sv_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */
     union {
-       NV      xnvu_nv;        /* numeric value, if any */
        struct {
            void *xnv_p1;
            union {
@@ -344,6 +350,7 @@ struct xpvlv {
                IV xnv_i2;
            }   xnv_u2;
        }       xnv_s;
+       NV      xnvu_nv;        /* numeric value, if any */
     }          xnv_u;
     MAGIC*     xmg_magic;      /* linked list of magicalness */
     HV*                xmg_stash;      /* class package */
@@ -367,7 +374,6 @@ struct xpvgv {
     STRLEN     xpv_cur;        /* length of sv_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */
     union {
-       NV      xnvu_nv;        /* numeric value, if any */
        struct {
            void *xnv_p1;
            union {
@@ -375,6 +381,7 @@ struct xpvgv {
                IV xnv_i2;
            }   xnv_u2;
        }       xnv_s;
+       NV      xnvu_nv;        /* numeric value, if any */
     }          xnv_u;
     MAGIC*     xmg_magic;      /* linked list of magicalness */
     HV*                xmg_stash;      /* class package */
@@ -391,7 +398,6 @@ struct xpvbm {
     STRLEN     xpv_cur;        /* length of sv_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */
     union {
-       NV      xnvu_nv;        /* numeric value, if any */
        struct {
            void *xnv_p1;
            union {
@@ -399,6 +405,7 @@ struct xpvbm {
                IV xnv_i2;
            }   xnv_u2;
        }       xnv_s;
+       NV      xnvu_nv;        /* numeric value, if any */
     }          xnv_u;
     MAGIC*     xmg_magic;      /* linked list of magicalness */
     HV*                xmg_stash;      /* class package */
@@ -417,7 +424,6 @@ struct xpvfm {
     STRLEN     xpv_cur;        /* length of sv_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */
     union {
-       NV      xnvu_nv;        /* numeric value, if any */
        struct {
            void *xnv_p1;
            union {
@@ -425,6 +431,7 @@ struct xpvfm {
                IV xnv_i2;
            }   xnv_u2;
        }       xnv_s;
+       NV      xnvu_nv;        /* numeric value, if any */
     }          xnv_u;
     MAGIC*     xmg_magic;      /* linked list of magicalness */
     HV*                xmg_stash;      /* class package */
@@ -451,7 +458,6 @@ struct xpvio {
     STRLEN     xpv_cur;        /* length of sv_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */
     union {
-       NV      xnvu_nv;        /* numeric value, if any */
        struct {
            void *xnv_p1;
            union {
@@ -459,6 +465,7 @@ struct xpvio {
                IV xnv_i2;
            }   xnv_u2;
        }       xnv_s;
+       NV      xnvu_nv;        /* numeric value, if any */
     }          xnv_u;
     MAGIC*     xmg_magic;      /* linked list of magicalness */
     HV*                xmg_stash;      /* class package */