From 632713babbc349920f71f73cc304c9a18078fd6b Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Thu, 12 Apr 2018 14:17:03 +0430 Subject: [PATCH] Always enable atexit on Android (#971) Obviously one can use a newer NDK for building an updated HarfBuzz instead that now pretty old version however I am concerned if that version checking is working with clang that is used with the newer NDK versions. --- src/hb-private.hh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/hb-private.hh b/src/hb-private.hh index e40217ee4..3181eb578 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -226,11 +226,9 @@ static int errno = 0; /* Use something better? */ * mingw32 headers say atexit is safe to use in shared libraries. */ # define HB_USE_ATEXIT 1 -# elif defined(__ANDROID__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) -/* This was fixed in Android NKD r8 or r8b: - * https://code.google.com/p/android/issues/detail?id=6455 - * which introduced GCC 4.6: - * https://developer.android.com/tools/sdk/ndk/index.html +# elif defined(__ANDROID__) +/* This is available since Android NKD r8 or r8b: + * https://issuetracker.google.com/code/p/android/issues/detail?id=6455 */ # define HB_USE_ATEXIT 1 # elif defined(__APPLE__)