diff options
| -rw-r--r-- | intern/cycles/util/util_task.h | 3 | ||||
| -rw-r--r-- | intern/cycles/util/util_tbb.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h index c3bc14348be..a56ca62f62c 100644 --- a/intern/cycles/util/util_task.h +++ b/intern/cycles/util/util_task.h @@ -19,11 +19,10 @@ #include "util/util_list.h" #include "util/util_string.h" +#include "util/util_tbb.h" #include "util/util_thread.h" #include "util/util_vector.h" -#include "util/util_tbb.h" - CCL_NAMESPACE_BEGIN class TaskPool; diff --git a/intern/cycles/util/util_tbb.h b/intern/cycles/util/util_tbb.h index 7a3dacb3a9d..301cb80c5b0 100644 --- a/intern/cycles/util/util_tbb.h +++ b/intern/cycles/util/util_tbb.h @@ -17,6 +17,10 @@ #ifndef __UTIL_TBB_H__ #define __UTIL_TBB_H__ +/* TBB includes <windows.h>, do it ourselves first so we are sure + * WIN32_LEAN_AND_MEAN and similar are defined beforehand. */ +#include "util_windows.h" + #define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 #include <tbb/tbb.h> |