diff options
| author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2019-06-08 21:14:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-08 21:14:15 +0200 |
| commit | abbbde87e28982150d30e748b89c5303384909ca (patch) | |
| tree | 5bf3beb567e9816442bee27790ffdd96ff0bfac2 /modules/mono/build_scripts | |
| parent | 693582f00837bb4ce4fb3ce91d2366ee359eecf4 (diff) | |
| parent | 26f9d907d48ecac5f32d8e94f1366478d9f75ce3 (diff) | |
Merge pull request #29606 from neikeq/remove-unneeded-mono-patches
Remove obsolete mono patch for pthread_mutexattr_setprotocol
Diffstat (limited to 'modules/mono/build_scripts')
| -rw-r--r-- | modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff | 13 |
1 files changed, 0 insertions, 13 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 deleted file mode 100644 index 21cb1a0cf8..0000000000 --- a/modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff +++ /dev/null @@ -1,13 +0,0 @@ -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)) |