diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-10-26 05:06:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-26 05:06:19 +0400 |
commit | 48c1e0c0fcb66502026721a50ae5e17470aee816 (patch) | |
tree | 94e812e78479df2d84dc8d0faccad212ca6fde56 /source/blender/blenlib | |
parent | 00160d4a1be401b789bc470cc397b1172353b116 (diff) |
spelling: use American spelling for canceled
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_task.h | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/task.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/threads.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_task.h b/source/blender/blenlib/BLI_task.h index f57d42858c7..c9cbaf997fb 100644 --- a/source/blender/blenlib/BLI_task.h +++ b/source/blender/blenlib/BLI_task.h @@ -88,8 +88,8 @@ void BLI_task_pool_cancel(TaskPool *pool); /* stop all worker threads */ void BLI_task_pool_stop(TaskPool *pool); -/* for worker threads, test if cancelled */ -bool BLI_task_pool_cancelled(TaskPool *pool); +/* for worker threads, test if canceled */ +bool BLI_task_pool_canceled(TaskPool *pool); /* optional userdata pointer to pass along to run function */ void *BLI_task_pool_userdata(TaskPool *pool); diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c index 7fa108b906f..4ae60abb2c8 100644 --- a/source/blender/blenlib/intern/task.c +++ b/source/blender/blenlib/intern/task.c @@ -402,7 +402,7 @@ void BLI_task_pool_stop(TaskPool *pool) BLI_assert(pool->num == 0); } -bool BLI_task_pool_cancelled(TaskPool *pool) +bool BLI_task_pool_canceled(TaskPool *pool) { return pool->do_cancel; } diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index 64682965649..4361583dafc 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -624,7 +624,7 @@ struct ThreadQueue { pthread_cond_t push_cond; pthread_cond_t finish_cond; volatile int nowait; - volatile int cancelled; + volatile int canceled; }; ThreadQueue *BLI_thread_queue_init(void) |