From 5b9219565cecc909638325bd82bfeb13d63711cc Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 23 Jul 2008 12:08:55 +0000 Subject: [PATCH] Remove the use of __cpu_to_be64() and replace it with hton64(). This commit was SVN r18995. --- config/ompi_check_openib.m4 | 2 +- ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/ompi_check_openib.m4 b/config/ompi_check_openib.m4 index 6f73a6caa3..9b126e1a39 100644 --- a/config/ompi_check_openib.m4 +++ b/config/ompi_check_openib.m4 @@ -172,7 +172,7 @@ AC_DEFUN([OMPI_CHECK_OPENIB],[ # starting with OFED 1.2 or so, so check for # ib_cm_open_device (introduced in libibcm 1.0/OFED 1.2). if test "$enable_openib_ibcm" = "yes"; then - AC_CHECK_HEADERS([infiniband/cm.h asm/byteorder.h], + AC_CHECK_HEADERS([infiniband/cm.h], [AC_CHECK_LIB([ibcm], [ib_cm_open_device], [$1_have_ibcm=1 $1_LIBS="-libcm $$1_LIBS"])]) diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c b/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c index 8725b751a6..6076ea5d57 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c @@ -257,7 +257,6 @@ #include #include #include -#include #include "opal/util/if.h" #include "opal/util/error.h" @@ -631,7 +630,7 @@ static void ibcm_component_register(void) * The value was taken from IBCM kernel level */ #ifndef IB_CM_ASSIGN_SERVICE_ID -#define IB_CM_ASSIGN_SERVICE_ID __cpu_to_be64(0x0200000000000000ULL) +#define IB_CM_ASSIGN_SERVICE_ID hton64(0x0200000000000000ULL) #endif static int ibcm_component_query(mca_btl_openib_module_t *btl,