From 1c20feb52b307cc62b6b26324930c2037b5f7f6a Mon Sep 17 00:00:00 2001 From: Rich Graham Date: Thu, 25 Jan 2007 18:32:47 +0000 Subject: [PATCH] Take into account constants that in the cray headers are defined different than in the portals spec. This commit was SVN r13311. --- ompi/mca/common/portals/common_portals.c | 2 ++ ompi/mca/common/portals/common_portals.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ompi/mca/common/portals/common_portals.c b/ompi/mca/common/portals/common_portals.c index a27759bc53..07f7c4bdbe 100644 --- a/ompi/mca/common/portals/common_portals.c +++ b/ompi/mca/common/portals/common_portals.c @@ -107,9 +107,11 @@ ompi_common_portals_error_ptl_to_ompi(int ptl_error) case PTL_SR_INDEX_INVALID: ret = OMPI_ERR_BAD_PARAM; break; +#if !OMPI_PORTALS_CRAYXT3 case PTL_UNKNOWN_ERROR: ret = OMPI_ERROR; break; +#endif default: ret = OMPI_ERROR; } diff --git a/ompi/mca/common/portals/common_portals.h b/ompi/mca/common/portals/common_portals.h index 1e0e5f4659..f27a463f16 100644 --- a/ompi/mca/common/portals/common_portals.h +++ b/ompi/mca/common/portals/common_portals.h @@ -38,6 +38,8 @@ #include #define PTL_EQ_HANDLER_NONE NULL +/* Cray's definition, differs from the spec */ +#define PTL_NO_ACK_REQ PTL_NOACK_REQ #define OMPI_BTL_PORTALS_SEND_TABLE_ID 30 #define OMPI_BTL_PORTALS_RDMA_TABLE_ID 31