Reorder the union to cause Win32 compilers to use void * alignment for

it.

p4raw-id: //depot/perl@24569

1 files changed, 7 insertions, 7 deletions

diff --git a/sv.h b/sv.h
index 2fb5f4d97e..69aad463ad 100644
--- a/sv.h
+++ b/sv.h
@@ -306,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 {
@@ -314,6 +313,7 @@ struct xpvnv {
 		IV xnv_i2;
 	    }	xnv_u2;
 	}	xnv_s;
+	NV	xnvu_nv;	/* numeric value, if any */
     }		xnv_u;
 };
 
@@ -325,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 {
@@ -333,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 */
@@ -343,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 {
@@ -351,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 */
@@ -374,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 {
@@ -382,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 */
@@ -398,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 {
@@ -406,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 */
@@ -424,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 {
@@ -432,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 */
@@ -458,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 {
@@ -466,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 */