luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-20 14:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib/gthread-posix: Use __ANDROID__ to test for the OS, not __BIONIC__

Browse Source 
See https://android.googlesource.com/platform/bionic/+/HEAD/docs/defines.md
This commit is contained in:
L. E. Segovia 2024-04-02 08:43:00 -03:00
parent e0fca3e7a7
commit fe8348efb4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glib/gthread-posix.c
View File

@ -1625,7 +1625,7 @@ g_cond_wait_until (GCond *cond,
g_mutex_unlock (mutex); g_mutex_unlock (mutex);
#if defined(HAVE_FUTEX_TIME64) #if defined(HAVE_FUTEX_TIME64)
#if defined(__BIONIC__) #if defined(__ANDROID__)
if (__builtin_available (android 30, *)) { if (__builtin_available (android 30, *)) {
#else #else
{ {

4
glib/gthreadprivate.h
View File

@ -74,7 +74,7 @@ struct _GRealThread
* in size between the two syscall variants! * in size between the two syscall variants!
*/ */
#if defined(HAVE_FUTEX) && defined(HAVE_FUTEX_TIME64) #if defined(HAVE_FUTEX) && defined(HAVE_FUTEX_TIME64)
#if defined(__BIONIC__) #if defined(__ANDROID__)
#define g_futex_simple(uaddr, futex_op, ...) \ #define g_futex_simple(uaddr, futex_op, ...) \
G_STMT_START \ G_STMT_START \
{ \ { \
@ -115,7 +115,7 @@ struct _GRealThread
} \ } \
} \ } \
G_STMT_END G_STMT_END
#endif /* defined(__BIONIC__) */ #endif /* defined(__ANDROID__) */
#elif defined(HAVE_FUTEX_TIME64) #elif defined(HAVE_FUTEX_TIME64)
#define g_futex_simple(uaddr, futex_op, ...) \ #define g_futex_simple(uaddr, futex_op, ...) \
G_STMT_START \ G_STMT_START \