diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/evas/src/lib/cache/evas_preload.c | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/src/lib/cache/evas_preload.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libraries/evas/src/lib/cache/evas_preload.c b/libraries/evas/src/lib/cache/evas_preload.c index 6e0412a..5eebaed 100644 --- a/libraries/evas/src/lib/cache/evas_preload.c +++ b/libraries/evas/src/lib/cache/evas_preload.c | |||
@@ -225,6 +225,7 @@ evas_preload_thread_run(void (*func_heavy) (void *data), | |||
225 | If no thread and as we don't want to break app that rely on this | 225 | If no thread and as we don't want to break app that rely on this |
226 | facility, we will lock the interface until we are done. | 226 | facility, we will lock the interface until we are done. |
227 | */ | 227 | */ |
228 | (void)func_cancel; | ||
228 | func_heavy((void *)data); | 229 | func_heavy((void *)data); |
229 | func_end((void *)data); | 230 | func_end((void *)data); |
230 | return (void *)1; | 231 | return (void *)1; |
@@ -253,12 +254,13 @@ evas_preload_thread_cancel(Evas_Preload_Pthread *thread) | |||
253 | } | 254 | } |
254 | } | 255 | } |
255 | LKU(_mutex); | 256 | LKU(_mutex); |
256 | 257 | ||
257 | /* Delay the destruction */ | 258 | /* Delay the destruction */ |
258 | work = (Evas_Preload_Pthread_Worker *)thread; | 259 | work = (Evas_Preload_Pthread_Worker *)thread; |
259 | work->cancel = EINA_TRUE; | 260 | work->cancel = EINA_TRUE; |
260 | return EINA_FALSE; | 261 | return EINA_FALSE; |
261 | #else | 262 | #else |
263 | (void) thread; | ||
262 | return EINA_TRUE; | 264 | return EINA_TRUE; |
263 | #endif | 265 | #endif |
264 | } | 266 | } |