Changeset 5659

Timestamp:

11/02/09 08:51:45 (3 weeks ago)

Author:

goodell

Message:

Avoid duplicate symbols in comm_create if weak symbols aren't available.

Fixes ticket #913.

No reviewer.

Files:

• mpich2/trunk/src/mpi/comm/comm_create.c (modified) (3 diffs)

mpich2/trunk/src/mpi/comm/comm_create.c

@@ -19 +19 @@
 /* -- End Profiling Symbol Block */
 
-/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
-   the MPI routines */
-#ifndef MPICH_MPI_FROM_PMPI
-#undef MPI_Comm_create
-#define MPI_Comm_create PMPI_Comm_create
-
-#endif
-
 /* prototypes to make the compiler happy in the case that PMPI_LOCAL expands to
  * nothing instead of "static" */
@@ -42 +34 @@
 PMPI_LOCAL int MPIR_Comm_create_intra(MPID_Comm *comm_ptr, MPID_Group *group_ptr, MPI_Comm *newcomm);
 PMPI_LOCAL int MPIR_Comm_create_inter(MPID_Comm *comm_ptr, MPID_Group *group_ptr, MPI_Comm *newcomm);
+
+
+/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
+   the MPI routines */
+#ifndef MPICH_MPI_FROM_PMPI
+#undef MPI_Comm_create
+#define MPI_Comm_create PMPI_Comm_create
 
 /* This function allocates and calculates an array (*mapping_out) such that
@@ -486 +485 @@
 }
 
+#endif /* !defined(MPICH_MPI_FROM_PMPI) */
 
 #undef FUNCNAME