From fc4b5f72837b3df426905782485aee7b794cb692 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Wed, 11 Apr 2012 16:47:27 +0200 Subject: [PATCH] Tweak the FEATURE_IS_ENABLED() macro to avoid a bug in the HP-UX compiler. --- feature.h | 4 +++- regen/feature.pl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/feature.h b/feature.h index b595cab..dc9696e 100644 --- a/feature.h +++ b/feature.h @@ -20,10 +20,12 @@ #define CURRENT_FEATURE_BUNDLE \ ((CURRENT_HINTS & HINT_FEATURE_MASK) >> HINT_FEATURE_SHIFT) +/* Avoid using ... && Perl_feature_is_enabled(...) as that triggers a bug in + the HP-UX cc on PA-RISC */ #define FEATURE_IS_ENABLED(name) \ ((CURRENT_HINTS \ & HINT_LOCALIZE_HH) \ - && Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name))) + ? Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name)) : FALSE) /* The longest string we pass in. */ #define MAX_FEATURE_LEN (sizeof("evalbytes")-1) diff --git a/regen/feature.pl b/regen/feature.pl index 2a8d369..222215a 100755 --- a/regen/feature.pl +++ b/regen/feature.pl @@ -231,10 +231,12 @@ print $h <<'EOH'; #define CURRENT_FEATURE_BUNDLE \ ((CURRENT_HINTS & HINT_FEATURE_MASK) >> HINT_FEATURE_SHIFT) +/* Avoid using ... && Perl_feature_is_enabled(...) as that triggers a bug in + the HP-UX cc on PA-RISC */ #define FEATURE_IS_ENABLED(name) \ ((CURRENT_HINTS \ & HINT_LOCALIZE_HH) \ - && Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name))) + ? Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name)) : FALSE) /* The longest string we pass in. */ EOH -- 1.8.3.1