I was mistaken. Borland and gcc do have snprintf() and vsnprintf()

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

diff --git a/gv.h b/gv.h
index ab74552..269843f 100644 (file)
--- a/gv.h
+++ b/gv.h
@@ -48,16 +48,17 @@ struct gp {
           assert(SvTYPE(zzzz) == SVt_PVGV || SvTYPE(zzzz) >= SVt_PVLV); \
           &(GvXPVGV(zzzz)->xiv_u.xivu_namehek);                        \
         }))
+#  define GvNAME_get(gv)       ({ assert(GvNAME_HEK(gv)); HEK_KEY(GvNAME_HEK(gv)); })
+#  define GvNAMELEN_get(gv)    ({ assert(GvNAME_HEK(gv)); HEK_LEN(GvNAME_HEK(gv)); })
 #else
 #  define GvGP(gv)     ((gv)->sv_u.svu_gp)
 #  define GvFLAGS(gv)  (GvXPVGV(gv)->xpv_cur)
 #  define GvSTASH(gv)  (GvXPVGV(gv)->xnv_u.xgv_stash)
 #  define GvNAME_HEK(gv)       (GvXPVGV(gv)->xiv_u.xivu_namehek)
+#  define GvNAME_get(gv)       HEK_KEY(GvNAME_HEK(gv))
+#  define GvNAMELEN_get(gv)    HEK_LEN(GvNAME_HEK(gv))
 #endif
 
-#define GvNAME_get(gv)         (GvNAME_HEK(gv) ? HEK_KEY(GvNAME_HEK(gv)) : NULL)
-#define GvNAMELEN_get(gv)      (GvNAME_HEK(gv) ? HEK_LEN(GvNAME_HEK(gv)) : 0)
-
 #define GvNAME(gv)     GvNAME_get(gv)
 #define GvNAMELEN(gv)  GvNAMELEN_get(gv)
 
@@ -164,8 +165,8 @@ Return the SV from the GV.
 #define GvIN_PAD_off(gv)       (GvFLAGS(gv) &= ~GVf_IN_PAD)
 
 #define GvUNIQUE(gv)            0
-#define GvUNIQUE_on(gv)
-#define GvUNIQUE_off(gv)
+#define GvUNIQUE_on(gv)         NOOP
+#define GvUNIQUE_off(gv)        NOOP
 
 #ifdef USE_ITHREADS
 #define GV_UNIQUE_CHECK