This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Remove some _get variants of *NAMEUTF8 macros in [gh]v.h
[perl5.git] / hv.h
diff --git a/hv.h b/hv.h
index f97f159..4eafcc6 100644 (file)
--- a/hv.h
+++ b/hv.h
@@ -259,10 +259,8 @@ C<SV*>.
 #define HvEITER_get(hv)        (SvOOK(hv) ? HvAUX(hv)->xhv_eiter : NULL)
 #define HvNAME(hv)     HvNAME_get(hv)
 #define HvNAMELEN(hv)   HvNAMELEN_get(hv)
-#define HvNAMEUTF8(hv)  HvNAMEUTF8_get(hv)
 #define HvENAME(hv)    HvENAME_get(hv)
 #define HvENAMELEN(hv)  HvENAMELEN_get(hv)
-#define HvENAMEUTF8(hv) HvENAMEUTF8_get(hv)
 
 /* Checking that hv is a valid package stash is the
    caller's responsibility */
@@ -287,7 +285,7 @@ C<SV*>.
 #define HvNAMELEN_get(hv) \
        ((SvOOK(hv) && HvAUX(hv)->xhv_name_u.xhvnameu_name && HvNAME_HEK_NN(hv)) \
                                 ? HEK_LEN(HvNAME_HEK_NN(hv)) : 0)
-#define HvNAMEUTF8_get(hv) \
+#define HvNAMEUTF8(hv) \
        ((SvOOK(hv) && HvAUX(hv)->xhv_name_u.xhvnameu_name && HvNAME_HEK_NN(hv)) \
                                 ? HEK_UTF8(HvNAME_HEK_NN(hv)) : 0)
 #define HvENAME_HEK_NN(hv)                                             \
@@ -305,7 +303,7 @@ C<SV*>.
 #define HvENAMELEN_get(hv) \
        ((SvOOK(hv) && HvAUX(hv)->xhv_name_u.xhvnameu_name && HvENAME_HEK_NN(hv)) \
                                 ? HEK_LEN(HvENAME_HEK_NN(hv)) : 0)
-#define HvENAMEUTF8_get(hv) \
+#define HvENAMEUTF8(hv) \
        ((SvOOK(hv) && HvAUX(hv)->xhv_name_u.xhvnameu_name && HvENAME_HEK_NN(hv)) \
                                 ? HEK_UTF8(HvENAME_HEK_NN(hv)) : 0)