Remove the vestigal "#if 0"s from header files that defined same-sized

*allocated structs, as these are not going to be needed again.

p4raw-id: //depot/perl@29664

diff --git a/av.h b/av.h
index 3dfd39e..566b8e0 100644 (file)
--- a/av.h
+++ b/av.h
@@ -38,9 +38,6 @@ struct xpvav {
     HV*                xmg_stash;      /* class package */
 };
 
     HV*                xmg_stash;      /* class package */
 };
 

-#if 0
-typedef struct xpvav xpvav_allocated;
-#else

 typedef struct {
     SSize_t    xav_fill;       /* Index of last element present */
     SSize_t    xav_max;        /* max index for which array has space */
 typedef struct {
     SSize_t    xav_fill;       /* Index of last element present */
     SSize_t    xav_max;        /* max index for which array has space */


@@ -57,7 +54,6 @@ typedef struct {
     } xmg_u;
     HV*                xmg_stash;      /* class package */
 } xpvav_allocated;
     } xmg_u;
     HV*                xmg_stash;      /* class package */
 } xpvav_allocated;

-#endif

 
 /* SV**        xav_alloc; */
 #define xav_alloc xiv_u.xivu_p1
 
 /* SV**        xav_alloc; */
 #define xav_alloc xiv_u.xivu_p1

diff --git a/hv.h b/hv.h
index 4a2f053..595c761 100644 (file)
--- a/hv.h
+++ b/hv.h
@@ -80,9 +80,6 @@ struct xpvhv {
 
 #define xhv_keys xiv_u.xivu_iv
 
 
 #define xhv_keys xiv_u.xivu_iv
 

-#if 0
-typedef struct xpvhv xpvhv_allocated;
-#else

 typedef struct {
     STRLEN     xhv_fill;       /* how full xhv_array currently is */
     STRLEN     xhv_max;        /* subscript of last element of xhv_array */
 typedef struct {
     STRLEN     xhv_fill;       /* how full xhv_array currently is */
     STRLEN     xhv_max;        /* subscript of last element of xhv_array */


@@ -99,7 +96,6 @@ typedef struct {
     } xmg_u;
     HV*                xmg_stash;      /* class package */
 } xpvhv_allocated;
     } xmg_u;
     HV*                xmg_stash;      /* class package */
 } xpvhv_allocated;

-#endif

 
 /* hash a key */
 /* FYI: This is the "One-at-a-Time" algorithm by Bob Jenkins
 
 /* hash a key */
 /* FYI: This is the "One-at-a-Time" algorithm by Bob Jenkins

diff --git a/sv.h b/sv.h
index 0bafb99..ec4e518 100644 (file)
--- a/sv.h
+++ b/sv.h
@@ -403,14 +403,10 @@ struct xpv {
     STRLEN     xpv_len;        /* allocated size */
 };
 
     STRLEN     xpv_len;        /* allocated size */
 };
 

-#if 0
-typedef struct xpv xpv_allocated;
-#else

 typedef struct {
     STRLEN     xpv_cur;        /* length of svu_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */
 } xpv_allocated;
 typedef struct {
     STRLEN     xpv_cur;        /* length of svu_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */
 } xpv_allocated;

-#endif

 
 struct xpviv {
     union {
 
 struct xpviv {
     union {


@@ -437,9 +433,6 @@ struct xpviv {
     }          xiv_u;
 };
 
     }          xiv_u;
 };
 

-#if 0
-typedef struct xpviv xpviv_allocated;
-#else

 typedef struct {
     STRLEN     xpv_cur;        /* length of svu_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */
 typedef struct {
     STRLEN     xpv_cur;        /* length of svu_pv as a C string */
     STRLEN     xpv_len;        /* allocated size */


@@ -451,7 +444,6 @@ typedef struct {
        HEK *   xivu_namehek;
     }          xiv_u;
 } xpviv_allocated;
        HEK *   xivu_namehek;
     }          xiv_u;
 } xpviv_allocated;

-#endif

 
 #define xiv_iv xiv_u.xivu_iv
 
 
 #define xiv_iv xiv_u.xivu_iv