Fix CID 1092: remove a useless header file (bml_base_endpoint.h -- it

didn't contain anything!) and therefore remove some include file
recursion.

This commit was SVN r19226.

ompi/mca/bml/base/Makefile.am

@@ -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
@@ -18,8 +19,7 @@
 
 headers += \
         base/base.h \
-        base/bml_base_btl.h \
-        base/bml_base_endpoint.h
+        base/bml_base_btl.h
 
 libmca_bml_la_SOURCES += \
 	base/bml_base_btl.c \

ompi/mca/bml/base/bml_base_endpoint.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -20,7 +21,6 @@
 
 #include "opal/sys/atomic.h"
 #include "ompi/mca/bml/bml.h"
-#include "bml_base_endpoint.h"
 #include "ompi/mca/pml/pml.h" 
 
 

ompi/mca/bml/base/bml_base_endpoint.h

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
- *                         of Tennessee Research Foundation.  All rights
- *                         reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
- *                         University of Stuttgart.  All rights reserved.
- * Copyright (c) 2004-2006 The Regents of the University of California.
- *                         All rights reserved.
- * $COPYRIGHT$
- * 
- * Additional copyrights may follow
- * 
- * $HEADER$
- */
-
-#ifndef MCA_BML_BASE_ENDPOINT_H
-#define MCA_BML_BASE_ENDPOINT_H
-
-#include "ompi_config.h"
-
-#include "opal/mca/mca.h"
-
-#include "ompi/mca/bml/bml.h"
-#include "orte/util/show_help.h"
-#include "opal/threads/mutex.h"
-#include "bml_base_btl.h" 
-
-/*
- * Global functions for the BML
- */
-
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
-    
-
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
-#endif /* MCA_BML_BASE_H */
-
-
-
-

ompi/mca/bml/base/bml_base_ft.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
@@ -21,7 +22,6 @@
 #include "ompi/mca/bml/base/base.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
-#include "ompi/mca/bml/base/bml_base_endpoint.h"
 #include "ompi/mca/bml/base/bml_base_btl.h"
 
 int mca_bml_base_ft_event(int state)

ompi/mca/bml/bml.h

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -29,7 +30,6 @@
 #include "ompi/mca/btl/btl.h"
 
 #include "ompi/mca/bml/base/bml_base_btl.h"
-#include "ompi/mca/bml/base/bml_base_endpoint.h" 
 
 #include "ompi/types.h"
 #include "ompi/class/ompi_free_list.h"

ompi/mca/bml/r2/bml_r2.c

@@ -11,6 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
  *                         reserved. 
+ * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -29,7 +30,6 @@
 #include "ompi/mca/bml/base/base.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
-#include "ompi/mca/bml/base/bml_base_endpoint.h" 
 #include "ompi/mca/bml/base/bml_base_btl.h" 
 #include "bml_r2.h"
 #include "orte/util/name_fns.h"

ompi/mca/bml/r2/bml_r2_ft.c

@@ -11,6 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
  *                         reserved. 
+ * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -30,7 +31,6 @@
 #include "ompi/mca/bml/base/base.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
-#include "ompi/mca/bml/base/bml_base_endpoint.h" 
 #include "ompi/mca/bml/base/bml_base_btl.h" 
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/pml/base/base.h"