[Bf-blender-cvs] [8357659] master: Final overlooked cleanup for last commit
Jens Verwiebe
noreply at git.blender.org
Sun Apr 27 18:44:39 CEST 2014
Commit: 835765926f486256b4fb0aa838154679855b9cb2
Author: Jens Verwiebe
Date: Sun Apr 27 18:44:23 2014 +0200
https://developer.blender.org/rB835765926f486256b4fb0aa838154679855b9cb2
Final overlooked cleanup for last commit
===================================================================
M source/blender/blenlib/intern/threads.c
===================================================================
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c
index 74e513b..ded2fd7 100644
--- a/source/blender/blenlib/intern/threads.c
+++ b/source/blender/blenlib/intern/threads.c
@@ -54,15 +54,9 @@
# include <sys/time.h>
#endif
-#ifdef _OPENMP
-#include <omp.h>
-#endif
-
-#if defined(__APPLE__) && defined(_OPENMP)
-#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 2) && !defined(__clang__)
+#if defined(__APPLE__) && defined(_OPENMP) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 2) && !defined(__clang__)
# define USE_APPLE_OMP_FIX
#endif
-#endif // __APPLE__
#ifdef USE_APPLE_OMP_FIX
/* ************** libgomp (Apple gcc 4.2.1) TLS bug workaround *************** */
More information about the Bf-blender-cvs
mailing list