summaryrefslogtreecommitdiff
path: root/src/lib/evas/common
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2017-04-13 14:32:07 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2017-04-13 16:11:39 +0200
commit9a15eeacedf2266f995f80d49c0b1b68f3e0b13d (patch)
treea418719371c3e7ff080620276df4636fe637e225 /src/lib/evas/common
parent53fef30db0aecc191384dae81882b50eba79da1a (diff)
Revert "efl: terrible kludge so avoid termination crash on osx"
The only purpose of this commit was to allow efl 1.19 to be released on macOS wothout crashing on termination. Time to revert it and see that we can find a real fix for the next release. This reverts commit cd5e755951c0126f136b6e7cfded14056d8336fa. ref T5245
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r--src/lib/evas/common/evas_thread_render.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c
index e66acd5270..85955669ac 100644
--- a/src/lib/evas/common/evas_thread_render.c
+++ b/src/lib/evas/common/evas_thread_render.c
@@ -220,21 +220,7 @@ evas_thread_shutdown(void)
220 } 220 }
221 } 221 }
222 222
223#if defined(__APPLE__) && defined(__MACH__)
224 /*
225 * FIXME
226 *
227 * MacOS currently undergo a fatal issue on shutdown: pthread_join()
228 * crashes. I still have no clue why... Sue to the imminent release,
229 * let's NOT join this thread: do nothing at all!
230 *
231 * THIS IS A TERRIBLE KLUDGE. IT MUST NOT STAY AFTER THE RELEASE OCCURS!
232 *
233 * FIXME
234 */
235#else
236 eina_thread_join(evas_thread_worker); 223 eina_thread_join(evas_thread_worker);
237#endif
238timeout_shutdown: 224timeout_shutdown:
239 eina_lock_free(&evas_thread_queue_lock); 225 eina_lock_free(&evas_thread_queue_lock);
240 eina_condition_free(&evas_thread_queue_condition); 226 eina_condition_free(&evas_thread_queue_condition);