Cleanup: make it possible to include util_tbb.h in any order

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;

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>