[Bf-blender-cvs] [ffafe494f62] master: Cleanup: Remove double #ifdef WITH_TBB check

[Ray Molenkamp]

Commit: ffafe494f62654d2d6de4684bed4a9cb7c2ccb55
Author: Ray Molenkamp
Date:   Sat Mar 26 09:55:08 2022 -0600
Branches: master
https://developer.blender.org/rBffafe494f62654d2d6de4684bed4a9cb7c2ccb55

Cleanup: Remove double #ifdef WITH_TBB check

===================================================================

M	source/blender/blenlib/BLI_enumerable_thread_specific.hh

===================================================================

diff --git a/source/blender/blenlib/BLI_enumerable_thread_specific.hh b/source/blender/blenlib/BLI_enumerable_thread_specific.hh
index 51bf8d06cf1..a5bd79d5826 100644
--- a/source/blender/blenlib/BLI_enumerable_thread_specific.hh
+++ b/source/blender/blenlib/BLI_enumerable_thread_specific.hh
@@ -3,23 +3,20 @@
 #pragma once
 
 #ifdef WITH_TBB
-
-#  ifdef WITH_TBB
 /* Quiet top level deprecation message, unrelated to API usage here. */
-#    if defined(WIN32) && !defined(NOMINMAX)
+#  if defined(WIN32) && !defined(NOMINMAX)
 /* TBB includes Windows.h which will define min/max macros causing issues
  * when we try to use std::min and std::max later on. */
-#      define NOMINMAX
-#      define TBB_MIN_MAX_CLEANUP
-#    endif
-#    include <tbb/enumerable_thread_specific.h>
-#    ifdef WIN32
+#    define NOMINMAX
+#    define TBB_MIN_MAX_CLEANUP
+#  endif
+#  include <tbb/enumerable_thread_specific.h>
+#  ifdef WIN32
 /* We cannot keep this defined, since other parts of the code deal with this on their own, leading
  * to multiple define warnings unless we un-define this, however we can only undefine this if we
  * were the ones that made the definition earlier. */
-#      ifdef TBB_MIN_MAX_CLEANUP
-#        undef NOMINMAX
-#      endif
+#    ifdef TBB_MIN_MAX_CLEANUP
+#      undef NOMINMAX
 #    endif
 #  endif
 #endif