Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / utility / gmxomp.h

diff --git a/src/gromacs/utility/gmxomp.h b/src/gromacs/utility/gmxomp.h
index 39664aecb6077e6b2df8c76240b2bfcad042a852..553eadc09294483bc5555c83eecbb11e7f4bed7c 100644 (file)
--- a/src/gromacs/utility/gmxomp.h
+++ b/src/gromacs/utility/gmxomp.h
@@ -49,9 +49,7 @@
 #ifndef GMX_UTILITY_OMP_H
 #define GMX_UTILITY_OMP_H
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 
@@ -69,7 +67,7 @@
 #include <windows.h>
 #endif
 
-#include "basedefinitions.h"
+#include "gromacs/utility/basedefinitions.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -145,14 +143,14 @@ gmx_bool gmx_omp_check_thread_affinity(char **message);
  */
 static gmx_inline void gmx_pause()
 {
-#ifndef GMX_NATIVE_WINDOWS
+#ifndef _MSC_VER
     /* Ugly hack because the openmp implementation below hacks into the SIMD
      * settings to decide when to use _mm_pause(). This should eventually be
      * changed into proper detection of the intrinsics uses, not SIMD.
      */
-#if (defined GMX_SIMD_X86_SSE2) || (defined GMX_SIMD_X86_SSE4_1) || \
+#if ((defined GMX_SIMD_X86_SSE2) || (defined GMX_SIMD_X86_SSE4_1) || \
     (defined GMX_SIMD_X86_AVX_128_FMA) || (defined GMX_SIMD_X86_AVX_256) || \
-    (defined GMX_SIMD_X86_AVX2_256)
+    (defined GMX_SIMD_X86_AVX2_256)) && !defined(__MINGW32__)
     /* Replace with tbb::internal::atomic_backoff when/if we use TBB */
     _mm_pause();
 #elif defined __MIC__