usnic: consolidate orte includes into compat.h

These includes only exist in the Cisco-internal usnic-v1.6 code base,
but they should not exist anywhere except btl_usnic_compat.h in order to
minimize source differences between usnic-v1.6 and v1.7/trunk.

Reviewed-by: Jeff Squyres <jsquyres@cisco.com>

cmr=v1.7.5:ticket=trac:4253

This commit was SVN r30844.

The following Trac tickets were found above:
  Ticket 4253 --> https://svn.open-mpi.org/trac/ompi/ticket/4253

ompi/mca/btl/usnic/btl_usnic_compat.h

@@ -21,6 +21,11 @@
 /* for per-file #ifdefs, esp. #includes */
 #  define OMPI_BTL_USNIC_CISCO_V1_6 1
 
+/* for some of the ORTE_* constants that we name-shift to OMPI_* here */
+#  include "orte/mca/errmgr/errmgr.h"
+#  include "orte/runtime/orte_globals.h"
+#  include "orte/util/show_help.h"
+
 #define opal_event_set(event_base_,A,B,C,D,E) \
     opal_event_set(A,B,C,D,E)
 #  define opal_show_help orte_show_help
@@ -52,6 +57,10 @@
 
 #elif (OMPI_MAJOR_VERSION == 1 && OMPI_MINOR_VERSION >= 7) || \
       (OMPI_MAJOR_VERSION >= 2)
+
+/* the v1.7+ equivalent way to get OMPI_ERROR_LOG and friends */
+#  include "ompi/mca/rte/rte.h"
+
 /* v1.7, v1.8 (to be released), trunk (v1.9), or later */
 /* TODO validate that all of these things actually work with v1.7 */
 #  define USNIC_OUT ompi_btl_base_framework.framework_output

ompi/mca/btl/usnic/btl_usnic_component.c

@@ -55,7 +55,6 @@
 #include "opal/mca/memchecker/base/base.h"
 #include "opal/util/show_help.h"
 
-#include "ompi/mca/rte/rte.h"
 #include "ompi/constants.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"

ompi/mca/btl/usnic/btl_usnic_module.c

@@ -33,7 +33,6 @@
 #include "opal/include/opal_stdint.h"
 #include "opal/util/show_help.h"
 
-#include "ompi/mca/rte/rte.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/btl_base_error.h"
 #include "ompi/mca/mpool/base/base.h"

ompi/mca/btl/usnic/btl_usnic_proc.c

@@ -28,7 +28,6 @@
 #include "opal/util/arch.h"
 #include "opal/util/show_help.h"
 
-#include "ompi/mca/rte/rte.h"
 #include "ompi/runtime/ompi_module_exchange.h"
 #include "ompi/constants.h"
 

ompi/mca/btl/usnic/btl_usnic_util.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013-2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -15,7 +15,6 @@
 
 #include "opal/util/show_help.h"
 
-#include "ompi/mca/rte/rte.h"
 #include "ompi/constants.h"
 
 #include "btl_usnic_util.h"