X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fconfig.h.cmakein;h=4dffa2952a5f61382eb1f66d7fc155b671c62bc0;hb=c10a038ffc471ca47f65ef844e31b8ba26535344;hp=4fdf9d7369a3755e0fa73ef3a751dd3a2590dc6b;hpb=e8b8107c93c32c1ec4c6b6921ed2f8d46f5b2dc7;p=alexxy%2Fgromacs.git

diff --git a/src/config.h.cmakein b/src/config.h.cmakein
index 4fdf9d7369..4dffa2952a 100644
--- a/src/config.h.cmakein
+++ b/src/config.h.cmakein
@@ -43,6 +43,7 @@
  */
 #ifndef GMX_CONFIG_H
 #define GMX_CONFIG_H
+
 #include "gromacs/utility/gmx_header_config.h"
 
 /* TODO: For now, disable Doxygen warnings from here */
@@ -199,7 +200,10 @@
 #cmakedefine TMPI_ATOMICS
 
 /* Define for busy wait option  */
+/* See gmxpre-config.h.cmakein for explanation for the #ifdef */
+#ifndef TMPI_WAIT_FOR_NO_ONE
 #cmakedefine TMPI_WAIT_FOR_NO_ONE
+#endif
 
 /* Define for copy buffer option */
 #cmakedefine TMPI_COPY_BUFFER
@@ -339,6 +343,6 @@
 /* Define if we have zlib */
 #cmakedefine HAVE_ZLIB
 
-#endif
-
 /*! \endcond */
+
+#endif