Fix a problem cited by Pierre-Matthieu Anglade: some typos in the code

path in the MPI F77 API functions where sizeof(int) != sizeof(INTEGER).

This commit was SVN r12684.

NEWS

@@ -86,6 +86,9 @@ Trunk (not on release branches yet)
 1.1.3
 -----
 
+- Fix typos in the code path for when sizeof(int) != sizeof(INTEGER)
+  in the MPI F77 bindings functions.  Thanks to Pierre-Matthieu
+  Anglade for bringing this problem to our attention.
 - Fix for a memory leak in the derived datatype function
   ompi_ddt_duplicate().  Thanks to Andreas Schafer for reporting,
   diagnosing, and patching the leak.

ompi/mpi/f77/file_read_at_all_f.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -95,7 +96,7 @@ void mpi_file_read_at_all_f(MPI_Fint *fh, MPI_Offset *offset,
                                                 c_status));
 
 #if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
-   if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&& 
+   if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
        MPI_STATUS_IGNORE != c_status) {
       MPI_Status_c2f(c_status, status);
    }

ompi/mpi/f77/file_read_at_f.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -95,7 +96,7 @@ void mpi_file_read_at_f(MPI_Fint *fh, MPI_Offset *offset, char *buf,
 					     c_type, c_status));
 
 #if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
-   if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&& 
+   if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
        MPI_STATUS_IGNORE != c_status) {
         MPI_Status_c2f(c_status, status);
     }

ompi/mpi/f77/file_read_f.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -90,7 +91,7 @@ void mpi_file_read_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
                                          c_type, c_status));
 
 #if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
-   if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&& 
+   if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && 
        MPI_STATUS_IGNORE != c_status) {
       MPI_Status_c2f(c_status, status);
    }

ompi/mpi/f77/file_read_ordered_end_f.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -89,7 +90,7 @@ void mpi_file_read_ordered_end_f(MPI_Fint *fh, char *buf,
     *ierr = OMPI_INT_2_FINT(MPI_File_read_ordered_end(c_fh, buf, c_status));
 
 #if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
-    if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&& 
+    if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && 
        MPI_STATUS_IGNORE != c_status) {
         MPI_Status_c2f(c_status, status);
     }