From f2cc3a29488a261bd40b951e940d50479250a3fd Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 16 Jul 2020 18:42:15 +0200 Subject: [PATCH] Add Android check for strerror_r variant I don't know why Android does it like this, but at least it's easy to fix. (We are currently at __ANDROID_API__ == 21.) --- Source/Core/Common/CommonFuncs.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/CommonFuncs.cpp b/Source/Core/Common/CommonFuncs.cpp index a8c1abfea2..7c86ee8741 100644 --- a/Source/Core/Common/CommonFuncs.cpp +++ b/Source/Core/Common/CommonFuncs.cpp @@ -29,7 +29,8 @@ std::string LastStrerrorString() // We check defines in order to figure out variant is in use, and we store the returned value // to a variable so that we'll get a compile-time check that our assumption was correct. -#if defined(__GLIBC__) && (_GNU_SOURCE || (_POSIX_C_SOURCE < 200112L && _XOPEN_SOURCE < 600)) +#if (defined(__GLIBC__) || __ANDROID_API__ >= 23) && \ + (_GNU_SOURCE || (_POSIX_C_SOURCE < 200112L && _XOPEN_SOURCE < 600)) const char* str = strerror_r(errno, error_message, BUFFER_SIZE); return std::string(str); #else