Bs mmerge

buffers/utils_generic_exchange_nonblocking.c

@@ -20,7 +20,7 @@
 #include "utils_nonblocking.ih"
 
 #ifndef MPI /*Let's deal with this case once and for all*/
-void generic_exchange_direction_nonblocking(void *field_in, int bytes_per_site, int direction, MPI_Request *inreq, int* counter)
+void generic_exchange_direction_nonblocking(void *field_in, int bytes_per_site, int direction, int* counter)
 {}
 #else /* MPI */
 void generic_exchange_direction_nonblocking(void *field_in, int bytes_per_site, int direction, MPI_Request *inreq, int* counter)

buffers/utils_nonblocking.h

@@ -1,8 +1,11 @@
 #ifndef _UTILS_NONBLOCKING_H
 #define _UTILS_NONBLOCKING_H
 
+#ifndef MPI
+void generic_exchange_direction_nonblocking(void *field_in, int bytes_per_site, int direction, int *counter);
+#else
 void generic_exchange_direction_nonblocking(void *field_in, int bytes_per_site, int direction, MPI_Request *inreq, int *counter);
-
+#endif
 void generic_exchange_nogauge(void *field_in, int bytes_per_site );
 
 #endif