]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Fix Linux build error with musl libc
authorTBK <tbk@jjtc.eu>
Wed, 26 Feb 2020 20:12:45 +0000 (21:12 +0100)
committerGreg Hudson <ghudson@mit.edu>
Wed, 18 Mar 2020 14:44:04 +0000 (10:44 -0400)
Commit bf5953c549a6d279977df69ffe89b2ba51460eaf caused a build failure
on non-glibc Linux build environments.  Change the conditionalization
so that __GLIBC_PREREQ will only be used if it is defined.

[ghudson@mit.edu: simplified conditionals; rewrote commit message]

(cherry picked from commit cbdbc8d00d31344fafe00e0fdf984e04e631f7c4)

ticket: 8880
version_fixed: 1.18.1

src/util/support/plugins.c

index 3329db7dc3b4985bf4d4ab326265b36c65a21a6d..1644d16fd07e607a60d10613c44c422fcc576699 100644 (file)
@@ -62,8 +62,7 @@
  * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects
  * anyway.
  */
-#ifdef __linux__
-#include <features.h>
+#ifdef __GLIBC__PREREQ
 #if ! __GLIBC_PREREQ(2, 25)
 #define dlclose(x)
 #endif