From 569f2566ffb5c36981e32fc69b8b3c6593e70549 Mon Sep 17 00:00:00 2001 From: Szilard Pall Date: Tue, 26 Jun 2012 13:30:59 +0200 Subject: [PATCH] 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 --- src/gmxlib/gmx_omp.c | 2 +- src/mdlib/pme.c | 2 -- src/tools/geminate.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gmxlib/gmx_omp.c b/src/gmxlib/gmx_omp.c index 09b2a192e8..a5040dce0a 100644 --- 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 fac7dbb962..97d1828ff8 100644 --- a/src/mdlib/pme.c +++ b/src/mdlib/pme.c @@ -67,8 +67,6 @@ #include "tmpi.h" #endif -#include "gmx_omp.h" - #include #include #include diff --git a/src/tools/geminate.c b/src/tools/geminate.c index 672422932c..95eeba4a0a 100644 --- 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); -- 2.22.0