From 349ee654c1b42727999a95b47abee6f71dcbc32b Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Wed, 10 Apr 2013 15:08:31 +0000
Subject: [PATCH] Fix some --without-hwloc compile errors.  Also remove one
 assigned-but-not-used variable assignment.

This commit was SVN r28321.
---
 opal/mca/hwloc/base/hwloc_base_open.c       | 14 +++++++++-----
 orte/mca/odls/default/odls_default_module.c | 10 +++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/opal/mca/hwloc/base/hwloc_base_open.c b/opal/mca/hwloc/base/hwloc_base_open.c
index 196403ed70..7085f222d5 100644
--- a/opal/mca/hwloc/base/hwloc_base_open.c
+++ b/opal/mca/hwloc/base/hwloc_base_open.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011-2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -58,6 +58,7 @@ hwloc_obj_type_t opal_hwloc_levels[] = {
 bool opal_hwloc_use_hwthreads_as_cpus = false;
 #endif
 
+#if OPAL_HAVE_HWLOC
 static mca_base_var_enum_value_t hwloc_base_map[] = {
     {OPAL_HWLOC_BASE_MAP_NONE, "none"},
     {OPAL_HWLOC_BASE_MAP_LOCAL_ONLY, "local_only"},
@@ -70,6 +71,7 @@ static mca_base_var_enum_value_t hwloc_failure_action[] = {
     {OPAL_HWLOC_BASE_MBFA_ERROR, "error"},
     {0, NULL}
 };
+#endif
 
 static int opal_hwloc_base_register(mca_base_register_flag_t flags);
 static int opal_hwloc_base_open(mca_base_open_flag_t flags);
@@ -79,19 +81,18 @@ int opal_hwloc_base_close(void);
 MCA_BASE_FRAMEWORK_DECLARE(opal, hwloc, NULL, opal_hwloc_base_register, opal_hwloc_base_open, opal_hwloc_base_close,
                            mca_hwloc_base_static_components, 0);
 
+#if OPAL_HAVE_HWLOC
 static char *opal_hwloc_base_binding_policy = NULL;
 static bool opal_hwloc_base_bind_to_core = false;
 static bool opal_hwloc_base_bind_to_socket = false;
+#endif
 
 static int opal_hwloc_base_register(mca_base_register_flag_t flags)
 {
+#if OPAL_HAVE_HWLOC
     mca_base_var_enum_t *new_enum;
     int ret;
 
-#if !OPAL_HAVE_HWLOC
-    return OPAL_ERR_NOT_AVAILABLE;
-#endif
-
     /* hwloc_base_mbind_policy */
 
     opal_hwloc_base_map = OPAL_HWLOC_BASE_MAP_NONE;
@@ -163,6 +164,9 @@ static int opal_hwloc_base_register(mca_base_register_flag_t flags)
 
     /* register components */
     return OPAL_SUCCESS;
+#else /* OPAL_HAVE_HWLOC */
+    return OPAL_ERR_NOT_AVAILABLE;
+#endif
 }
 
 static int opal_hwloc_base_open(mca_base_open_flag_t flags)
diff --git a/orte/mca/odls/default/odls_default_module.c b/orte/mca/odls/default/odls_default_module.c
index 552769565a..beb86a5292 100644
--- a/orte/mca/odls/default/odls_default_module.c
+++ b/orte/mca/odls/default/odls_default_module.c
@@ -11,7 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2007-2010 Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2007      Evergrid, Inc. All rights reserved.
- * Copyright (c) 2008-2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2010      IBM Corporation.  All rights reserved.
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
@@ -367,7 +367,6 @@ static int send_warn_show_help(int fd, const char *file,
 static void send_error_show_help(int fd, int exit_status,
                                  const char *file, const char *topic, ...)
 {
-    int ret;
     va_list ap;
     pipe_err_msg_t msg;
 
@@ -376,7 +375,7 @@ static void send_error_show_help(int fd, int exit_status,
 
     /* Send it */
     va_start(ap, topic);
-    ret = write_help_msg(fd, &msg, file, topic, ap);
+    write_help_msg(fd, &msg, file, topic, ap);
     va_end(ap);
 
     exit(exit_status);
@@ -388,13 +387,10 @@ static int do_child(orte_app_context_t* context,
                     orte_job_t *jobdat, int write_fd,
                     orte_iof_base_io_conf_t opts)
 {
-    int i;
+    int i, rc;
     sigset_t sigs;
     long fd, fdmax = sysconf(_SC_OPEN_MAX);
-#if OPAL_HAVE_HWLOC
-    int rc;
     char *param, *msg;
-#endif
 
     if (orte_forward_job_control) {
         /* Set a new process group for this child, so that a