[mpich2-commits] r6724 - in mpich2/trunk/src/pm/hydra/tools/bind: . hwloc

[goodell at mcs.anl.gov]

Author: goodell
Date: 2010-05-24 14:21:04 -0500 (Mon, 24 May 2010)
New Revision: 6724

Modified:
   mpich2/trunk/src/pm/hydra/tools/bind/bind.c
   mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c
Log:
avoid duplicate symbols on Darwin, common symbols elsewhere

bind_hwloc.c now just uses the extern decl in bind.h, bind.c always defines the actual storage for HYDT_bind_info.

Reviewed by balaji at .

Modified: mpich2/trunk/src/pm/hydra/tools/bind/bind.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/bind.c	2010-05-24 19:00:44 UTC (rev 6723)
+++ mpich2/trunk/src/pm/hydra/tools/bind/bind.c	2010-05-24 19:21:04 UTC (rev 6724)
@@ -15,7 +15,7 @@
 #include "hwloc/bind_hwloc.h"
 #endif /* HAVE_HWLOC */
 
-struct HYDT_bind_info HYDT_bind_info;
+struct HYDT_bind_info HYDT_bind_info = {0};
 
 HYD_status HYDT_bind_init(char *user_binding, char *user_bindlib)
 {

Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c	2010-05-24 19:00:44 UTC (rev 6723)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c	2010-05-24 19:21:04 UTC (rev 6724)
@@ -8,8 +8,6 @@
 #include "bind.h"
 #include "bind_hwloc.h"
 
-struct HYDT_bind_info HYDT_bind_info;
-
 static hwloc_topology_t topology;
 static int topo_initialized = 0;