Changes to perlfaq8 "How do I find out if I'm running interactively

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

diff --git a/gv.h b/gv.h
index f48cb15..ab74552 100644 (file)
--- a/gv.h
+++ b/gv.h
@@ -28,8 +28,7 @@ struct gp {
 #if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
 #  define GvGP(gv)                                                     \
        (*({GV *const shplep = (GV *) (gv);                             \
-           assert(SvTYPE(shplep) == SVt_PVGV ||                        \
-           SvTYPE(shplep) == SVt_PVLV);                                \
+           assert(SvTYPE(shplep) == SVt_PVGV || SvTYPE(shplep) == SVt_PVLV); \
            assert(isGV_with_GP(shplep));                               \
            &((shplep)->sv_u.svu_gp);}))
 #  define GvFLAGS(gv)                                                  \
@@ -53,10 +52,10 @@ struct gp {
 #  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)->xgv_namehek)
+#  define GvNAME_HEK(gv)       (GvXPVGV(gv)->xiv_u.xivu_namehek)
 #endif
 
-#define GvNAME_get(gv)         (GvNAME_HEK(gv) ? HEK_KEY(GvNAME_HEK(gv)) : 0)
+#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)