From 8dff750285e43281511d4955813116418d22421f Mon Sep 17 00:00:00 2001 From: George Baltz N3GB Date: Wed, 20 Dec 2023 14:49:35 -0500 Subject: [PATCH] Define different (disambiguated) names for external use. --- include/hamlib/rig.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 36577c993..104e007b4 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -2470,9 +2470,18 @@ typedef hamlib_port_t port_t; * See https://github.com/Hamlib/Hamlib/issues/1445 */ // Note: Experimental, and subject to change!! +#if defined(IN_HAMLIB) +/* These are for internal use only */ #define RIGPORT(r) (&r->state.rigport) #define PTTPORT(r) (&r->state.pttport) #define DCDPORT(r) (&r->state.dcdport) +#else +/* Define external unique names */ +/* These will be changed to a function call before release */ +#define HAMLIB_RIGPORT(r) (&r->state.rigport) +#define HAMLIB_PTTPORT(r) (&r->state.pttport) +#define HAMLIB_DCDPORT(r) (&r->state.dcdport) +#endif /* Then when the rigport address is stored as a pointer somewhere else(say, * in the rig structure itself), the definition could be changed to * #define RIGPORT(r) r->somewhereelse