From e58a89ef3e41c6e8055d5691346b810e4ecc90b3 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Wed, 28 Jun 2006 11:25:09 +0000 Subject: [PATCH] OMPI_ENABLE_DEBUG is always defined (to 0 or 1). Use #if and nto #ifdef. This commit was SVN r10537. --- ompi/mca/btl/openib/btl_openib_eager_rdma.h | 4 ++-- ompi/mca/btl/openib/btl_openib_endpoint.c | 2 +- ompi/mca/btl/openib/btl_openib_frag.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ompi/mca/btl/openib/btl_openib_eager_rdma.h b/ompi/mca/btl/openib/btl_openib_eager_rdma.h index b040c87433..c049a2737a 100644 --- a/ompi/mca/btl/openib/btl_openib_eager_rdma.h +++ b/ompi/mca/btl/openib/btl_openib_eager_rdma.h @@ -25,7 +25,7 @@ struct mca_btl_openib_eager_rdma_local_t { uint16_t head; /**< RDMA buffer to poll */ uint16_t tail; /**< Needed for credit managment */ int32_t credits; /**< number of RDMA credits */ -#ifdef OMPI_ENABLE_DEBUG +#if OMPI_ENABLE_DEBUG uint32_t seq; #endif opal_mutex_t lock; /**< guard access to RDMA buffer */ @@ -37,7 +37,7 @@ struct mca_btl_openib_eager_rdma_remote_t { uint32_t rkey; /**< RKey for accessing remote buffer */ uint16_t head; /**< RDMA buffer to post to */ int32_t tokens; /**< number of rdam tokens */ -#ifdef OMPI_ENABLE_DEBUG +#if OMPI_ENABLE_DEBUG uint32_t seq; #endif }; diff --git a/ompi/mca/btl/openib/btl_openib_endpoint.c b/ompi/mca/btl/openib/btl_openib_endpoint.c index 536e6947d0..3f5722f5a6 100644 --- a/ompi/mca/btl/openib/btl_openib_endpoint.c +++ b/ompi/mca/btl/openib/btl_openib_endpoint.c @@ -167,7 +167,7 @@ static inline int mca_btl_openib_endpoint_post_send(mca_btl_openib_module_t* ope frag->wr_desc.sr_desc.opcode = IBV_WR_RDMA_WRITE; MCA_BTL_OPENIB_RDMA_FRAG_SET_SIZE(ftr, frag->sg_entry.length); MCA_BTL_OPENIB_RDMA_MAKE_LOCAL(ftr); -#ifdef OMPI_ENABLE_DEBUG +#if OMPI_ENABLE_DEBUG ((mca_btl_openib_footer_t*)(((char*)frag->segment.seg_addr.pval) + frag->segment.seg_len))->seq = endpoint->eager_rdma_remote.seq++; diff --git a/ompi/mca/btl/openib/btl_openib_frag.h b/ompi/mca/btl/openib/btl_openib_frag.h index ff107aeee9..d876dbee85 100644 --- a/ompi/mca/btl/openib/btl_openib_frag.h +++ b/ompi/mca/btl/openib/btl_openib_frag.h @@ -40,7 +40,7 @@ struct mca_btl_openib_header_t { typedef struct mca_btl_openib_header_t mca_btl_openib_header_t; struct mca_btl_openib_footer_t { -#ifdef OMPI_ENABLE_DEBUG +#if OMPI_ENABLE_DEBUG uint32_t seq; #endif union {