godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29606 from neikeq/remove-unneeded-mono-patches

Browse Source 
Remove obsolete mono patch for pthread_mutexattr_setprotocol
This commit is contained in:
Ignacio Roldán Etcheverry 2019-06-08 21:14:15 +02:00 committed by GitHub
commit abbbde87e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/mono/build_scripts/patches/fix-mono-android-pthread_mutexattr_setprotocol.diff
View File

@ -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))