From 238a6f851fc0e1fe2ce206b63282bf613896f9a0 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Thu, 23 Oct 2008 18:56:10 +0000
Subject: [PATCH] Wow.  And I won't name who it was who did this.  You know who
 you are!  :-)

We had a public symbol named "already_opened".  This commit changes
the name to mca_btl_base_already_opened.

I guess it's good we have the visibility stuff enabled by default!
:-)

This commit was SVN r19791.
---
 ompi/mca/btl/base/base.h           | 2 ++
 ompi/mca/btl/base/btl_base_close.c | 7 +++----
 ompi/mca/btl/base/btl_base_open.c  | 5 ++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ompi/mca/btl/base/base.h b/ompi/mca/btl/base/base.h
index 627afd5618..fff1f0489d 100644
--- a/ompi/mca/btl/base/base.h
+++ b/ompi/mca/btl/base/base.h
@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2006      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -72,6 +73,7 @@ extern char* mca_btl_base_exclude;
 extern int mca_btl_base_warn_component_unused;
 OMPI_DECLSPEC extern opal_list_t mca_btl_base_components_opened;
 OMPI_DECLSPEC extern opal_list_t mca_btl_base_modules_initialized;
+OMPI_DECLSPEC extern int mca_btl_base_already_opened;
 
 END_C_DECLS
     
diff --git a/ompi/mca/btl/base/btl_base_close.c b/ompi/mca/btl/base/btl_base_close.c
index 20521f3713..09569eef63 100644
--- a/ompi/mca/btl/base/btl_base_close.c
+++ b/ompi/mca/btl/base/btl_base_close.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) 2008      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -28,17 +29,15 @@
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 
-extern int already_opened;
-
 int mca_btl_base_close(void)
 {
     opal_list_item_t *item;
     mca_btl_base_selected_module_t *sm;
 
-    if( already_opened <= 0 ) {
+    if( mca_btl_base_already_opened <= 0 ) {
         return OMPI_ERROR;
     } else {
-        if( --already_opened > 0 ) {
+        if( --mca_btl_base_already_opened > 0 ) {
             return OMPI_SUCCESS;
         }
     }
diff --git a/ompi/mca/btl/base/btl_base_open.c b/ompi/mca/btl/base/btl_base_open.c
index aa6c5bb837..b4bccc2512 100644
--- a/ompi/mca/btl/base/btl_base_open.c
+++ b/ompi/mca/btl/base/btl_base_open.c
@@ -78,8 +78,7 @@ char* mca_btl_base_exclude = NULL;
 int mca_btl_base_warn_component_unused = 1;
 opal_list_t mca_btl_base_components_opened;
 opal_list_t mca_btl_base_modules_initialized;
-
-int already_opened = 0;
+int mca_btl_base_already_opened = 0;
 
 /**
  * Function for finding and opening either all MCA components, or the one
@@ -87,7 +86,7 @@ int already_opened = 0;
  */
 int mca_btl_base_open(void)
 {
-    if( ++already_opened > 1 ) return OMPI_SUCCESS;
+    if( ++mca_btl_base_already_opened > 1 ) return OMPI_SUCCESS;
 
     /* Verbose output */
     mca_base_param_reg_int_name("btl",