From bdef5a0fbfeeb6142d2dca9adbdb7d028eea92f9 Mon Sep 17 00:00:00 2001
From: Szilard Pall <pszilard@cbr.su.se>
Date: Fri, 7 May 2010 18:40:48 +0200
Subject: [PATCH] temporary fix for compilation error with GMX_OPENMM=ON

---
 include/gmx_parallel_3dfft.h | 4 +++-
 src/mdlib/fft5d.h            | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/gmx_parallel_3dfft.h b/include/gmx_parallel_3dfft.h
index ebb08f2555..b6c030e3b6 100644
--- 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 214f57eb4f..6356195339 100644
--- 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();
-- 
2.11.4.GIT