temporary fix for compilation error with GMX_OPENMM=ON

diff --git a/include/gmx_parallel_3dfft.h b/include/gmx_parallel_3dfft.h
index ebb08f25554add0ff46e63eddfda00c569678a21..b6c030e3b612305a0677ea1c98ddb9d5e8e3e1e9 100644 (file)
--- a/include/gmx_parallel_3dfft.h
+++ b/include/gmx_parallel_3dfft.h
@@ -34,9 +34,11 @@
 #include <mpi.h>
 #elif defined GMX_THREADS
 #include "tmpi.h"
-#else 
+#else
+#ifndef FFT5D_H_
 typedef void* MPI_Comm;
 #endif
+#endif
 
 typedef struct gmx_parallel_3dfft *
 gmx_parallel_3dfft_t;

diff --git a/src/mdlib/fft5d.h b/src/mdlib/fft5d.h
index 214f57eb4f61b6830ac2c920ee898a54e8e8b317..6356195339b149851d08a8e195e2b8e6aaed8eb4 100644 (file)
--- a/src/mdlib/fft5d.h
+++ b/src/mdlib/fft5d.h
@@ -19,7 +19,9 @@ FILE* debug;
 #include "tmpi.h"
 #else
 #ifndef HAVE_MPICOMM
+#ifndef _gmx_parallel_3dfft_h_
 typedef void* MPI_Comm;
+#endif
 #define HAVE_MPICOMM
 #endif
 double MPI_Wtime();