summaryrefslogtreecommitdiff
path: root/perlvars.h
diff options
context:
space:
mode:
authorKarl Williamson <khw@cpan.org>2018-02-16 15:15:06 -0700
committerKarl Williamson <khw@cpan.org>2018-02-18 11:02:37 -0700
commitb65bff596352d4149af558d10b3a0cb698d8c2b7 (patch)
tree2bc75010b6094d39d84bdc9396d3c14900394aac /perlvars.h
parent7e5377f714ebe84e0fe2599b3bfec50036f0d18f (diff)
downloadperl-b65bff596352d4149af558d10b3a0cb698d8c2b7.tar.gz
makedef.pl: Use all #ifdefs to decide
This uses all the conditions that go in to deciding to define this variable, instead of taking a shortcut. (It's unfortunate that the shortcut defined in perl.h now used elsewhere via commit 7e5377f714ebe84e0fe2599b3bfec50036f0d18f is not available to makedef.pl. It would make sense to have this file look at perl.h and avoid duplication). This fixes some freebsd builds, which failed because their hints file undef'd a different variable than this shortuct looked at.
Diffstat (limited to 'perlvars.h')
-rw-r--r--perlvars.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/perlvars.h b/perlvars.h
index 472ae2dbb9..708badef07 100644
--- a/perlvars.h
+++ b/perlvars.h
@@ -104,7 +104,10 @@ PERLVAR(G, locale_mutex, perl_mutex) /* Mutex for setlocale() changing */
#endif
/* Proxy for HAS_POSIX_2008_LOCALE, since that is not defined in time for this */
-#if defined(HAS_NEWLOCALE) && ! defined(NO_POSIX_2008_LOCALE)
+#if defined(HAS_NEWLOCALE) \
+ && defined(HAS_FREELOCALE) \
+ && defined(HAS_USELOCALE) \
+ && ! defined(NO_POSIX_2008_LOCALE)
PERLVAR(G, C_locale_obj, locale_t)
#endif