diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-03 18:06:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 18:06:07 +0200 |
| commit | 42569f566f7750e355bf07f15008b54677043536 (patch) | |
| tree | 1f896d45a14d5a7c777d45b02ad7ca780cc30cd7 /modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff | |
| parent | 22583ec6a39bb56943c78c0ed9a094b28b666b75 (diff) | |
| parent | 14df9e5cb2e9f2de4adf9b979e8ef33de37b80bd (diff) | |
Merge pull request #29359 from neikeq/android-mono
Android build and export for the mono module
Diffstat (limited to 'modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff')
| -rw-r--r-- | modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff b/modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff new file mode 100644 index 0000000000..21cb1a0cf8 --- /dev/null +++ b/modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff @@ -0,0 +1,13 @@ +diff --git a/mono/utils/mono-os-mutex.h b/mono/utils/mono-os-mutex.h +index e8039bf4094..ee39c0330b3 100644 +--- a/mono/utils/mono-os-mutex.h ++++ b/mono/utils/mono-os-mutex.h +@@ -57,7 +57,7 @@ mono_os_mutex_init_type (mono_mutex_t *mutex, int type) + if (G_UNLIKELY (res != 0)) + g_error ("%s: pthread_mutexattr_settype failed with \"%s\" (%d)", __func__, g_strerror (res), res); + +-#ifdef PTHREAD_PRIO_INHERIT ++#if defined(PTHREAD_PRIO_INHERIT) && __ANDROID_API__ >= 28 + /* use PTHREAD_PRIO_INHERIT if possible */ + res = pthread_mutexattr_setprotocol (&attr, PTHREAD_PRIO_INHERIT); + if (G_UNLIKELY (res != 0 && res != ENOTSUP)) |