From d701ceeb15662038435b80ba556a80c17f76d2dc Mon Sep 17 00:00:00 2001 From: Vincent Prince Date: Mon, 16 Sep 2019 13:30:13 +0200 Subject: [PATCH 03/10] Use __GLIBC__ to control use of gnu_get_libc_version Signed-off-by: Khem Raj Signed-off-by: Vincent Prince --- src/mongo/util/processinfo_linux.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp index cccb91c..45c4b7d 100644 --- a/src/mongo/util/processinfo_linux.cpp +++ b/src/mongo/util/processinfo_linux.cpp @@ -44,10 +44,10 @@ #include #ifdef __BIONIC__ #include -#elif __UCLIBC__ -#include -#else +#elif defined(__GLIBC__) && !defined(__UCLIBC__) #include +#else +#include #endif #include @@ -546,7 +546,7 @@ void ProcessInfo::SystemInfo::collectSystemInfo() { std::stringstream ss; ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__; bExtra.append("libcVersion", ss.str()); -#else +#elif defined(__GLIBC__) bExtra.append("libcVersion", gnu_get_libc_version()); #endif if (!verSig.empty()) -- 2.7.4