Merging r58112 through r58124 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 9 Jul 2013 19:22:26 +0000 (19:22 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 9 Jul 2013 19:22:26 +0000 (19:22 +0000)
1  2 
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/BLI_threads.h
source/blender/editors/space_view3d/drawobject.c

index 329cc2959ca4808a038ef5ac54f6226058b459e3,154986936a29f5416f2ba95d73b759e932ed96e4..d2ad8e3ec9f9ed3444289f4124b840891d7aa4da
@@@ -183,23 -182,6 +183,16 @@@ int BLI_thread_queue_size(ThreadQueue *
  void BLI_thread_queue_wait_finish(ThreadQueue *queue);
  void BLI_thread_queue_nowait(ThreadQueue *queue);
  
- /* Thread Local Storage */
- #ifdef _MSC_VER
- #  define ThreadVariable  __declspec(thread)
- #else
- #  define ThreadVariable  __thread
- #endif
 +/* Condition */
 +
 +typedef pthread_cond_t ThreadCondition;
 +
 +void BLI_condition_init(ThreadCondition *cond);
 +void BLI_condition_wait(ThreadCondition *cond, ThreadMutex *mutex);
 +void BLI_condition_notify_one(ThreadCondition *cond);
 +void BLI_condition_notify_all(ThreadCondition *cond);
 +void BLI_condition_end(ThreadCondition *cond);
 +
  #ifdef __cplusplus
  }
  #endif