From 6770a86a0a22209fed170fc8bec4c31308f87ef9 Mon Sep 17 00:00:00 2001
From: degomme <augustin.degomme@unibas.ch>
Date: Mon, 19 Oct 2015 16:55:52 +0200
Subject: [PATCH 1/1] handle MPI_WIN_NULL in fortran

---
 include/smpi/mpif.h.in | 3 +++
 include/smpi/smpi.h    | 2 +-
 src/smpi/smpi_rma.c    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/smpi/mpif.h.in b/include/smpi/mpif.h.in
index 3d4d949108..84adf9356e 100644
--- a/include/smpi/mpif.h.in
+++ b/include/smpi/mpif.h.in
@@ -114,6 +114,9 @@
       parameter(MPI_GROUP_NULL=-1)
       parameter(MPI_GROUP_EMPTY=-2)
 
+      integer MPI_WIN_NULL
+      parameter(MPI_WIN_NULL=-1)
+
       integer MPI_ERRORS_RETURN, MPI_ERRORS_ARE_FATAL
       integer MPI_ERRHANDLER_NULL
       parameter(MPI_ERRORS_RETURN=0)
diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index a9117e2af7..429f818fd4 100644
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -178,7 +178,7 @@ SG_BEGIN_DECL()
 #define MPI_ROOT 0
 #define MPI_INFO_NULL NULL
 #define MPI_COMM_TYPE_SHARED    1
-#define MPI_WIN_NULL NULL
+#define MPI_WIN_NULL ((MPI_Win)NULL)
 
 #define MPI_VERSION 1
 #define MPI_SUBVERSION 1
diff --git a/src/smpi/smpi_rma.c b/src/smpi/smpi_rma.c
index 6afba576ae..859bd918db 100644
--- a/src/smpi/smpi_rma.c
+++ b/src/smpi/smpi_rma.c
@@ -89,7 +89,7 @@ int smpi_mpi_win_free( MPI_Win* win){
     MPI_Info_free(&(*win)->info);
   }
   xbt_free(*win);
-  win = MPI_WIN_NULL;
+  *win = MPI_WIN_NULL;
   return MPI_SUCCESS;
 }
 
-- 
2.20.1