From 82f5d588db9fcde701dc36b494c6873fe0b0d1f4 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 17 Feb 2004 13:21:39 +0000 Subject: [PATCH] replace p by pcar__ --- src/libCom/misc/epicsExport.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libCom/misc/epicsExport.h b/src/libCom/misc/epicsExport.h index fe6b16292..11d768345 100644 --- a/src/libCom/misc/epicsExport.h +++ b/src/libCom/misc/epicsExport.h @@ -21,14 +21,15 @@ extern "C" { typedef void (*REGISTRAR)(void); -#define EPICS_EXPORT_POBJ(obj) p ## obj +#define EPICS_EXPORT_POBJ(typ,obj) pvar_ ## typ ## _ ## obj +#define EPICS_EXPORT_PFUNC(obj) pvar_func_ ## obj #define epicsExportAddress(typ,obj) \ -epicsShareExtern typ *EPICS_EXPORT_POBJ(obj); \ -epicsShareDef typ *EPICS_EXPORT_POBJ(obj) = (typ *)&obj +epicsShareExtern typ *EPICS_EXPORT_POBJ(typ,obj); \ +epicsShareDef typ *EPICS_EXPORT_POBJ(typ,obj) = (typ *)&obj #define epicsExportRegistrar(func) \ -epicsShareFunc REGISTRAR EPICS_EXPORT_POBJ(func) = (REGISTRAR)(void*)&func +epicsShareFunc REGISTRAR EPICS_EXPORT_PFUNC(func) = (REGISTRAR)(void*)&func #ifdef __cplusplus }