Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / legacyheaders / gmx_omp_nthreads.h

diff --git a/src/gromacs/legacyheaders/gmx_omp_nthreads.h b/src/gromacs/legacyheaders/gmx_omp_nthreads.h
index bbd6e612cbdc3b63dfc8bcefbbc523d71afc266c..b256573aabd99502b58f1c070f2493a165d8a735 100644 (file)
--- a/src/gromacs/legacyheaders/gmx_omp_nthreads.h
+++ b/src/gromacs/legacyheaders/gmx_omp_nthreads.h
@@ -63,6 +63,7 @@ void gmx_omp_nthreads_init(FILE *fplog, t_commrec *cr,
 int gmx_omp_nthreads_get(int mod);
 
 /*! Read the OMP_NUM_THREADS env. var. and check against the value set on the command line. */
-void gmx_omp_nthreads_read_env(int *nthreads_omp);
+void gmx_omp_nthreads_read_env(int *nthreads_omp,
+                               gmx_bool bIsSimMaster);
 
 #endif /* GMX_OMP_NTHREADS */