diff options
| author | Father Chrysostomos <sprout@cpan.org> | 2010-10-29 22:51:13 -0700 |
|---|---|---|
| committer | Father Chrysostomos <sprout@cpan.org> | 2010-10-29 22:51:13 -0700 |
| commit | c4842d1d15ea656de7335f8bcb5acceaf4646f6f (patch) | |
| tree | 4161299b51fdedb69d606fc9faa9f2bf085c65d4 | |
| parent | 41d7c195c68c882ae8e1bd0a34c55987b0a16375 (diff) | |
| download | perl-c4842d1d15ea656de7335f8bcb5acceaf4646f6f.tar.gz | |
Remove the #ifdef PERL_CORE surrounding the HvENAME* macros
| -rw-r--r-- | hv.h | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -287,23 +287,21 @@ C<SV*>. #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) |