fixes typo gmx_omp introduced by 697bcdc

Also removes an unnecessary include and replaces a few remaining
HAVE_OPENMP-s with GMX_OPENMP.

Change-Id: I8a92a5f1849d170951719b29b17e0ec6134ee556

diff --git a/src/gmxlib/gmx_omp.c b/src/gmxlib/gmx_omp.c
index 09b2a192e8cacc4d2c58c215a5ee896950207fc9..a5040dce0af315075de0a53d967a383844d7e9c3 100644 (file)
--- a/src/gmxlib/gmx_omp.c
+++ b/src/gmxlib/gmx_omp.c
@@ -22,7 +22,7 @@
  * Gnomes, ROck Monsters And Chili Sauce
  */
 
-#ifdef HAVE_CONFIG
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

diff --git a/src/mdlib/pme.c b/src/mdlib/pme.c
index fac7dbb962688394da9fff3e434122731f1d6a31..97d1828ff8a1cd8bddefe96e2bec22cbd2ca9ed5 100644 (file)
--- a/src/mdlib/pme.c
+++ b/src/mdlib/pme.c
@@ -67,8 +67,6 @@
 #include "tmpi.h"
 #endif
 
-#include "gmx_omp.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

diff --git a/src/tools/geminate.c b/src/tools/geminate.c
index 672422932cf3d79dd33ee19d06659ae4deaecf49..95eeba4a0a92fea816eb93587eede97b494048a6 100644 (file)
--- a/src/tools/geminate.c
+++ b/src/tools/geminate.c
@@ -657,7 +657,7 @@ extern real fitGemRecomb(double *ct, double *time, double **ctFit,
 #endif /* HAVE_LIBGSL */
 
 #ifdef HAVE_LIBGSL
-#ifdef HAVE_OPENMP
+#ifdef GMX_OPENMP
   nThreads = gmx_omp_get_max_threads();
   gmx_omp_set_num_threads(nThreads);
   fprintf(stdout, "We will be using %i threads.\n", nThreads);