From 970f86d2fc8c842f267dc99fa1ebb4093b5586ad Mon Sep 17 00:00:00 2001 From: Henning Westerholt Date: Mon, 7 Oct 2019 15:38:22 +0200 Subject: [PATCH] core: workaround related to T_OPT for alpine linux musl C library (GH #2095) (cherry picked from commit cec1043a9c4daa39b4245b87f28fb5566e8627bd) --- src/core/resolve.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/resolve.c b/src/core/resolve.c index 6edc47e5068..ac9b2f23630 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -32,8 +32,12 @@ #include #include -/* older glibc < 2.25 does not include T_OPT in nameser_compat.h yet */ -#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 25 +/* + * Older glibc < 2.25 does not include T_OPT in nameser_compat.h yet. + * On alpine linux musl library it is also not defined. There is no + * musl feature test macro, so we look for glibc instead. + */ +#if (defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ < 25) || !defined __GLIBC__ #ifndef T_OPT #define T_OPT ns_t_opt #endif