From: Father Chrysostomos Date: Sat, 30 Oct 2010 05:51:13 +0000 (-0700) Subject: Remove the #ifdef PERL_CORE surrounding the HvENAME* macros X-Git-Tag: upstream/5.16.3~7077 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4842d1d15ea656de7335f8bcb5acceaf4646f6f;p=platform%2Fupstream%2Fperl.git Remove the #ifdef PERL_CORE surrounding the HvENAME* macros --- diff --git a/hv.h b/hv.h index 84eac3d532..a85a0d0095 100644 --- a/hv.h +++ b/hv.h @@ -287,23 +287,21 @@ C. #define HvNAMELEN_get(hv) \ ((SvOOK(hv) && (HvAUX(hv)->xhv_name) && HvNAME_HEK_NN(hv)) \ ? HEK_LEN(HvNAME_HEK_NN(hv)) : 0) -#ifdef PERL_CORE -# define HvENAME_HEK_NN(hv) \ +#define HvENAME_HEK_NN(hv) \ ( \ HvAUX(hv)->xhv_name_count > 0 ? *(HEK **)HvAUX(hv)->xhv_name : \ HvAUX(hv)->xhv_name_count < -1 ? ((HEK **)HvAUX(hv)->xhv_name)[1] : \ HvAUX(hv)->xhv_name_count == -1 ? NULL : \ HvAUX(hv)->xhv_name \ ) -# define HvENAME_HEK(hv) \ +#define HvENAME_HEK(hv) \ (SvOOK(hv) && HvAUX(hv)->xhv_name ? HvENAME_HEK_NN(hv) : NULL) -# define HvENAME_get(hv) \ +#define HvENAME_get(hv) \ ((SvOOK(hv) && (HvAUX(hv)->xhv_name) && HvENAME_HEK_NN(hv)) \ ? HEK_KEY(HvENAME_HEK_NN(hv)) : NULL) -# define HvENAMELEN_get(hv) \ +#define HvENAMELEN_get(hv) \ ((SvOOK(hv) && (HvAUX(hv)->xhv_name) && HvENAME_HEK_NN(hv)) \ ? HEK_LEN(HvENAME_HEK_NN(hv)) : 0) -#endif /* the number of keys (including any placeholers) */ #define XHvTOTALKEYS(xhv) ((xhv)->xhv_keys)