minor fixes to make the trunk compile, if ompi has been configured with the --enable-mpi2-one-sided option

This commit was SVN r6518.

ompi/attribute/attribute.c

@@ -644,7 +644,7 @@ int ompi_attr_delete(ompi_attribute_type_t type, void *object,
 		
 #if OMPI_WANT_MPI2_ONE_SIDED
         case WIN_ATTR:
-            DELETE_ATTR_CALLBACKS(win, attre, key_item);
+            DELETE_ATTR_CALLBACKS(win, attr, key_item);
             break;
 #endif
 		

ompi/mpi/c/win_set_attr.c

@@ -44,7 +44,7 @@ int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val)
 	}
     }
 
-    ret = ompi_attr_set(WIN_ATTR, win, &win->w_keyhash, 
+    ret = ompi_attr_set_c(WIN_ATTR, win, &win->w_keyhash, 
                         win_keyval, attribute_val, false, true);
     OMPI_ERRHANDLER_RETURN(ret, win, MPI_ERR_OTHER, FUNC_NAME);  
 }

ompi/mpi/f77/win_create_keyval_f.c

@@ -60,7 +60,7 @@ static char FUNC_NAME[] = "MPI_Win_create_keyval";
 
 void mpi_win_create_keyval_f(ompi_mpi2_fortran_copy_attr_function* win_copy_attr_fn,
                              ompi_mpi2_fortran_delete_attr_function* win_delete_attr_fn,
-                             MPI_F_int *win_keyval, MPI_F_int *extra_state, MPI_F_int *ierr)
+                             MPI_Fint *win_keyval, MPI_Fint *extra_state, MPI_Fint *ierr)
 {
     int ret, c_err;
     ompi_attribute_fn_ptr_union_t copy_fn;

ompi/mpi/f77/win_get_attr_f.c

@@ -67,9 +67,9 @@ void mpi_win_get_attr_f(MPI_Fint *win, MPI_Fint *win_keyval,
        the top of src/attributes/attributes.c. */
 
     c_err = ompi_attr_get_fortran_mpi2(c_win->w_keyhash,
-                                       OMPI_FINT_2_INT(*keyhash),
+                                       OMPI_FINT_2_INT(*win_keyval),
                                        attribute_val,
-                                       &c_flag)
+                                       &c_flag);
     *ierr = OMPI_INT_2_FINT(c_err);
     *flag = OMPI_INT_2_FINT(c_flag);
 }

ompi/mpi/f77/win_set_attr_f.c

@@ -17,6 +17,9 @@
 #include "ompi_config.h"
 
 #include "mpi/f77/bindings.h"
+#include "attribute/attribute.h"
+#include "win/win.h"
+
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
 #pragma weak PMPI_WIN_SET_ATTR = mpi_win_set_attr_f