Commit: d2fbbed4620c7dff4117f07864ca8ce64740cc95
Author: Bastien Montagne
Date: Mon Nov 2 18:48:14 2015 +0100
Branches: master
https://developer.blender.org/rBd2fbbed4620c7dff4117f07864ca8ce64740cc95
Attempt to fix win32 compilation after own recent commits.
===================================================================
M source/blender/blenlib/intern/task.c
===================================================================
diff --git a/source/blender/blenlib/intern/task.c
b/source/blender/blenlib/intern/task.c
index 3374a58..b37bb43 100644
--- a/source/blender/blenlib/intern/task.c
+++ b/source/blender/blenlib/intern/task.c
@@ -347,6 +347,7 @@ static TaskPool *task_pool_create_ex(TaskScheduler
*scheduler, void *userdata, c
TaskPool *pool = MEM_callocN(sizeof(TaskPool), "TaskPool");
#ifndef NDEBUG
+# ifndef WIN32 /* WIN32 pthread_t seems to ba a struct, no direct comparison
available, *sigh* */
/* Assert we do not try to create a background pool from some parent
task - those only work OK from main thread. */
if (is_background) {
const pthread_t thread_id = pthread_self();
@@ -356,6 +357,7 @@ static TaskPool *task_pool_create_ex(TaskScheduler
*scheduler, void *userdata, c
BLI_assert(scheduler->threads[i] != thread_id);
}
}
+# endif
#endif
pool->scheduler = scheduler;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
