From 9dc4aa583e65ff147b4b6f1d06f8fadb667939f8 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Fri, 5 Aug 2005 13:57:06 +0000 Subject: [PATCH] Minimal possible change to allow static-linking of ompi: otherwise the mca_pml_base_ptl_t-Class is doubly defined, due to the close similarity to teg. This commit was SVN r6747. --- ompi/mca/pml/uniq/pml_uniq.c | 2 +- ompi/mca/pml/uniq/pml_uniq_ptl.c | 6 +++--- ompi/mca/pml/uniq/pml_uniq_ptl.h | 4 ++-- ompi/mca/pml/uniq/pml_uniq_sendreq.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ompi/mca/pml/uniq/pml_uniq.c b/ompi/mca/pml/uniq/pml_uniq.c index 7d96fa0075..08f2c7b4c2 100644 --- a/ompi/mca/pml/uniq/pml_uniq.c +++ b/ompi/mca/pml/uniq/pml_uniq.c @@ -294,7 +294,7 @@ int mca_pml_uniq_add_procs(ompi_proc_t** procs, size_t nprocs) NULL != ptl->ptl_request_init && NULL != ptl->ptl_request_fini) { - mca_pml_base_ptl_t* ptl_base = OBJ_NEW(mca_pml_base_ptl_t); + mca_pml_base_ptl_uniq_t* ptl_base = OBJ_NEW(mca_pml_base_ptl_uniq_t); ptl_base->ptl = ptl; ptl_base->ptl_cache_size = ptl->ptl_cache_size; ptl->ptl_base = ptl_base; diff --git a/ompi/mca/pml/uniq/pml_uniq_ptl.c b/ompi/mca/pml/uniq/pml_uniq_ptl.c index 2b74456d49..1061a036e4 100644 --- a/ompi/mca/pml/uniq/pml_uniq_ptl.c +++ b/ompi/mca/pml/uniq/pml_uniq_ptl.c @@ -19,7 +19,7 @@ #include "pml_uniq_ptl.h" -static void mca_pml_base_ptl_construct(mca_pml_base_ptl_t* ptl) +static void mca_pml_base_ptl_construct(mca_pml_base_ptl_uniq_t* ptl) { OBJ_CONSTRUCT(&ptl->ptl_cache, opal_list_t); OBJ_CONSTRUCT(&ptl->ptl_cache_lock, opal_mutex_t); @@ -28,14 +28,14 @@ static void mca_pml_base_ptl_construct(mca_pml_base_ptl_t* ptl) ptl->ptl_cache_alloc = 0; } -static void mca_pml_base_ptl_destruct(mca_pml_base_ptl_t* ptl) +static void mca_pml_base_ptl_destruct(mca_pml_base_ptl_uniq_t* ptl) { OBJ_DESTRUCT(&ptl->ptl_cache); OBJ_DESTRUCT(&ptl->ptl_cache_lock); } OBJ_CLASS_INSTANCE( - mca_pml_base_ptl_t, + mca_pml_base_ptl_uniq_t, opal_list_t, mca_pml_base_ptl_construct, mca_pml_base_ptl_destruct diff --git a/ompi/mca/pml/uniq/pml_uniq_ptl.h b/ompi/mca/pml/uniq/pml_uniq_ptl.h index 883e7a198a..ce0379ecb4 100644 --- a/ompi/mca/pml/uniq/pml_uniq_ptl.h +++ b/ompi/mca/pml/uniq/pml_uniq_ptl.h @@ -32,9 +32,9 @@ struct mca_pml_base_ptl_t { opal_mutex_t ptl_cache_lock; /**< lock for queue access */ struct mca_ptl_base_module_t* ptl; /**< back pointer to ptl */ }; -typedef struct mca_pml_base_ptl_t mca_pml_base_ptl_t; +typedef struct mca_pml_base_ptl_t mca_pml_base_ptl_uniq_t; -OBJ_CLASS_DECLARATION(mca_pml_base_ptl_t); +OBJ_CLASS_DECLARATION(mca_pml_base_ptl_uniq_t); #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/ompi/mca/pml/uniq/pml_uniq_sendreq.h b/ompi/mca/pml/uniq/pml_uniq_sendreq.h index 504985abec..08f27c55bb 100644 --- a/ompi/mca/pml/uniq/pml_uniq_sendreq.h +++ b/ompi/mca/pml/uniq/pml_uniq_sendreq.h @@ -41,7 +41,7 @@ OBJ_CLASS_DECLARATION(mca_pml_uniq_send_request_t); rc) \ { \ mca_pml_proc_t *proc = mca_pml_uniq_proc_lookup_remote(comm,dst); \ - mca_pml_base_ptl_t* ptl_base; \ + mca_pml_base_ptl_uniq_t* ptl_base; \ \ if(NULL == proc) { \ return OMPI_ERR_OUT_OF_RESOURCE; \ @@ -119,7 +119,7 @@ OBJ_CLASS_DECLARATION(mca_pml_uniq_send_request_t); #define MCA_PML_UNIQ_SEND_REQUEST_RETURN(sendreq) \ { \ mca_ptl_base_module_t* ptl = (sendreq)->req_ptl; \ - mca_pml_base_ptl_t* ptl_base = ptl->ptl_base; \ + mca_pml_base_ptl_uniq_t* ptl_base = ptl->ptl_base; \ \ /* Let the base handle the reference counts */ \ MCA_PML_BASE_SEND_REQUEST_FINI( &((sendreq)->req_send) ); \