Removed dependency on windows.h through commrec.h, domdec.h.

Change-Id: If40506b521a4b4690506465a3f421dab93bc9ce6

diff --git a/include/domdec.h b/include/domdec.h
index 64b4d20a249af2bf3ea100233885cdf8cd0f8fb9..673b54f02e687b255373f17f60cc85a684eefa78 100644 (file)
--- a/include/domdec.h
+++ b/include/domdec.h
@@ -23,13 +23,6 @@
 #include "vsite.h"
 #include "genborn.h"
 
-#ifdef GMX_LIB_MPI
-#include <mpi.h>
-#endif
-#ifdef GMX_THREADS
-#include "tmpi.h"
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/include/domdec_network.h b/include/domdec_network.h
index 3f8506cb4e2dbe08de42a4fbfe03a839cfbf90e0..400c50bf9aed18428dfda1db336122a4954a8b3a 100644 (file)
--- a/include/domdec_network.h
+++ b/include/domdec_network.h
@@ -21,13 +21,6 @@
 
 #include "typedefs.h"
 
-#ifdef GMX_LIB_MPI
-#include <mpi.h>
-#endif
-#ifdef GMX_THREADS
-#include "tmpi.h"
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/include/mdrun.h b/include/mdrun.h
index 83789b5945a131ea757e9681e54b4a9706178239..6703169339683ee204b6167be43639e06b8e0b4e 100644 (file)
--- a/include/mdrun.h
+++ b/include/mdrun.h
@@ -51,6 +51,11 @@
 #include "pull.h"
 #include "update.h"
 
+
+#ifdef GMX_THREADS
+#include "thread_mpi/threads.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/include/types/commrec.h b/include/types/commrec.h
index 2baa5844fe448f8a1d3af3457cbd08113b64a89d..8201cf8c44730183d73be42e2d05275ceac5aa73 100644 (file)
--- a/include/types/commrec.h
+++ b/include/types/commrec.h
@@ -39,7 +39,8 @@
 #include <mpi.h>
 #else
 #ifdef GMX_THREADS
-#include "../tmpi.h"
+#include "../thread_mpi/tmpi.h"
+#include "../thread_mpi/mpi_bindings.h"
 #else
 typedef void* MPI_Comm;
 typedef void* MPI_Request;

diff --git a/src/gmxlib/shift_util.c b/src/gmxlib/shift_util.c
index 176077a36e2fd9248bdda4784e2f5e79668cb8e2..43c3d20c91b76e5632df03a74d500e086657b48b 100644 (file)
--- a/src/gmxlib/shift_util.c
+++ b/src/gmxlib/shift_util.c
@@ -53,7 +53,7 @@
 #include "gmxfio.h"
 
 #ifdef GMX_THREADS
-#include "thread_mpi.h"
+#include "thread_mpi/threads.h"
 #endif
 
 #define p2(x) ((x)*(x))

diff --git a/src/mdlib/gmx_fft_fftw3.c b/src/mdlib/gmx_fft_fftw3.c
index 342bba6ceac386795fc58187dfcd12c57b137bc6..396b201e43fb05682b9e18da0961a4936e643fe2 100644 (file)
--- a/src/mdlib/gmx_fft_fftw3.c
+++ b/src/mdlib/gmx_fft_fftw3.c
@@ -35,6 +35,9 @@
 #define FFTWPREFIX(name) fftwf_ ## name
 #endif
 
+#ifdef GMX_THREADS
+#include "thread_mpi/threads.h"
+#endif
 
 
 #ifdef GMX_THREADS