From 3d13428701bd445264711c3cc0b2bd6f08a59305 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 2 May 2000 20:06:10 +0000 Subject: [PATCH] better separation on code --- src/as/asDbLib.c | 4 ++-- src/as/asDbLib.h | 3 ++- src/as/asLib.h | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/as/asDbLib.c b/src/as/asDbLib.c index 7090c8ddf..c54a70de6 100644 --- a/src/as/asDbLib.c +++ b/src/as/asDbLib.c @@ -212,13 +212,13 @@ int epicsShareAPI asDbGetAsl(void *paddress) return((int)pflddes->as_level); } -ASMEMBERPVT epicsShareAPI asDbGetMemberPvt(void *paddress) +void * epicsShareAPI asDbGetMemberPvt(void *paddress) { DBADDR *paddr = paddress; dbCommon *precord; precord = paddr->precord; - return((ASMEMBERPVT)precord->asp); + return((void *)precord->asp); } static void astacCallback(ASCLIENTPVT clientPvt,asClientStatus status) diff --git a/src/as/asDbLib.h b/src/as/asDbLib.h index e2cc0edae..2603c5883 100644 --- a/src/as/asDbLib.h +++ b/src/as/asDbLib.h @@ -31,9 +31,10 @@ typedef struct { epicsShareFunc int epicsShareAPI asSetFilename(char *acf); epicsShareFunc int epicsShareAPI asSetSubstitutions(char *substitutions); +epicsShareFunc int epicsShareAPI asInit(void); epicsShareFunc int epicsShareAPI asInitAsyn(ASDBCALLBACK *pcallback); epicsShareFunc int epicsShareAPI asDbGetAsl( void *paddr); -epicsShareFunc ASMEMBERPVT epicsShareAPI asDbGetMemberPvt( void *paddr); +epicsShareFunc void * epicsShareAPI asDbGetMemberPvt( void *paddr); epicsShareFunc int epicsShareAPI asdbdump( void); epicsShareFunc int epicsShareAPI aspuag(char *uagname); epicsShareFunc int epicsShareAPI asphag(char *hagname); diff --git a/src/as/asLib.h b/src/as/asLib.h index 771350676..e9142df88 100644 --- a/src/as/asLib.h +++ b/src/as/asLib.h @@ -43,7 +43,6 @@ long asCheckPut(ASCLIENTPVT asClientPvt); ((asClientPvt)->access>=asWRITE ? TRUE : FALSE)\ : TRUE) -epicsShareFunc int epicsShareAPI asInit(void); epicsShareFunc long epicsShareAPI asInitialize(ASINPUTFUNCPTR inputfunction); epicsShareFunc long epicsShareAPI asInitFile(const char *filename,const char *substitutions); epicsShareFunc long epicsShareAPI asInitFP(FILE *fp,const char *substitutions);