From c71408409ff35a3e06e11ed4f95d7c3784c2712f Mon Sep 17 00:00:00 2001 From: Jeremy Lorelli Date: Wed, 15 Oct 2025 13:27:01 -0700 Subject: [PATCH] Fix errors in C23 mode --- asyn/asynRecord/asynRecord.c | 2 +- asyn/devEpics/devAsynFloat64.c | 6 +++--- asyn/devEpics/devAsynInt32.c | 18 ++++++++-------- asyn/devEpics/devAsynInt64.c | 14 ++++++------ asyn/devEpics/devAsynOctet.c | 30 +++++++++++++------------- asyn/devEpics/devAsynUInt32Digital.c | 16 +++++++------- asyn/devEpics/devAsynXXXTimeSeries.h | 2 +- asyn/devGpib/devCommonGpib.c | 6 ++++-- asyn/devGpib/devGpib.h | 32 ++++++++++++++-------------- asyn/devGpib/devSupportGpib.c | 2 +- testApp/src/devTestBlock.c | 2 +- 11 files changed, 66 insertions(+), 64 deletions(-) diff --git a/asyn/asynRecord/asynRecord.c b/asyn/asynRecord/asynRecord.c index 8ec1bcbe4..c245e5bd2 100644 --- a/asyn/asynRecord/asynRecord.c +++ b/asyn/asynRecord/asynRecord.c @@ -264,7 +264,7 @@ typedef struct asynRecordDset { } asynRecordDset; asynRecordDset asynRecordDevice = { - 5,0,0,0,getIoIntInfo,0}; + 5,0,0,0,(DEVSUPFUN)getIoIntInfo,0}; epicsExportAddress(dset, asynRecordDevice); diff --git a/asyn/devEpics/devAsynFloat64.c b/asyn/devEpics/devAsynFloat64.c index 54ba154c3..bb644c880 100644 --- a/asyn/devEpics/devAsynFloat64.c +++ b/asyn/devEpics/devAsynFloat64.c @@ -126,11 +126,11 @@ typedef struct analogDset { /* analog dset */ } analogDset; analogDset asynAiFloat64 = { - 6, 0, 0, initAi, getIoIntInfo, processAi, 0}; + 6, 0, 0, (DEVSUPFUN)initAi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAi, 0}; analogDset asynAoFloat64 = { - 6, 0, 0, initAo, getIoIntInfo, processAo, 0}; + 6, 0, 0, (DEVSUPFUN)initAo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAo, 0}; analogDset asynAiFloat64Average = { - 6, 0, 0, initAiAverage, getIoIntInfo, processAiAverage, 0}; + 6, 0, 0, (DEVSUPFUN)initAiAverage, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAiAverage, 0}; epicsExportAddress(dset, asynAiFloat64); epicsExportAddress(dset, asynAoFloat64); diff --git a/asyn/devEpics/devAsynInt32.c b/asyn/devEpics/devAsynInt32.c index d2dc420b9..9a7887e07 100644 --- a/asyn/devEpics/devAsynInt32.c +++ b/asyn/devEpics/devAsynInt32.c @@ -165,23 +165,23 @@ typedef struct analogDset { /* analog dset */ } analogDset; analogDset asynAiInt32 = { - 6,0,0,initAi, getIoIntInfo, processAi, convertAi }; + 6,0,0,(DEVSUPFUN)initAi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAi, (DEVSUPFUN)convertAi }; analogDset asynAiInt32Average = { - 6,0,0,initAiAverage,getIoIntInfo, processAiAverage , convertAi }; + 6,0,0,(DEVSUPFUN)initAiAverage,(DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAiAverage, (DEVSUPFUN)convertAi }; analogDset asynAoInt32 = { - 6,0,0,initAo, getIoIntInfo, processAo , convertAo }; + 6,0,0,(DEVSUPFUN)initAo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAo, (DEVSUPFUN)convertAo }; analogDset asynLiInt32 = { - 5,0,0,initLi, getIoIntInfo, processLi }; + 5,0,0,(DEVSUPFUN)initLi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLi }; analogDset asynLoInt32 = { - 5,0,0,initLo, getIoIntInfo, processLo }; + 5,0,0,(DEVSUPFUN)initLo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLo }; analogDset asynBiInt32 = { - 5,0,0,initBi, getIoIntInfo, processBi }; + 5,0,0,(DEVSUPFUN)initBi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processBi }; analogDset asynBoInt32 = { - 5,0,0,initBo, getIoIntInfo, processBo }; + 5,0,0,(DEVSUPFUN)initBo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processBo }; analogDset asynMbbiInt32 = { - 5,0,0,initMbbi, getIoIntInfo, processMbbi }; + 5,0,0,(DEVSUPFUN)initMbbi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbbi }; analogDset asynMbboInt32 = { - 5,0,0,initMbbo, getIoIntInfo, processMbbo }; + 5,0,0,(DEVSUPFUN)initMbbo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbbo }; epicsExportAddress(dset, asynAiInt32); epicsExportAddress(dset, asynAiInt32Average); diff --git a/asyn/devEpics/devAsynInt64.c b/asyn/devEpics/devAsynInt64.c index 49e0c7e09..a946ead6e 100644 --- a/asyn/devEpics/devAsynInt64.c +++ b/asyn/devEpics/devAsynInt64.c @@ -140,9 +140,9 @@ static long processLLi(int64inRecord *pr); static long processLLo(int64outRecord *pr); analogDset asynInt64In = { - 5,0,0,initLLi, getIoIntInfo, processLLi }; + 5,0,0,(DEVSUPFUN)initLLi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLLi }; analogDset asynInt64Out = { - 5,0,0,initLLo, getIoIntInfo, processLLo }; + 5,0,0,(DEVSUPFUN)initLLo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLLo }; epicsExportAddress(dset, asynInt64In); epicsExportAddress(dset, asynInt64Out); #endif @@ -161,15 +161,15 @@ static long processLo(longoutRecord *pr); analogDset asynAiInt64 = { - 6,0,0,initAi, getIoIntInfo, processAi, convertAi }; + 6,0,0,(DEVSUPFUN)initAi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAi, (DEVSUPFUN)convertAi }; analogDset asynAiInt64Average = { - 6,0,0,initAiAverage,getIoIntInfo, processAiAverage , convertAi }; + 6,0,0,(DEVSUPFUN)initAiAverage,(DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAiAverage , (DEVSUPFUN)convertAi }; analogDset asynAoInt64 = { - 6,0,0,initAo, getIoIntInfo, processAo , convertAo }; + 6,0,0,(DEVSUPFUN)initAo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processAo , (DEVSUPFUN)convertAo }; analogDset asynLiInt64 = { - 5,0,0,initLi, getIoIntInfo, processLi }; + 5,0,0,(DEVSUPFUN)initLi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLi }; analogDset asynLoInt64 = { - 5,0,0,initLo, getIoIntInfo, processLo }; + 5,0,0,(DEVSUPFUN)initLo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLo }; epicsExportAddress(dset, asynAiInt64); epicsExportAddress(dset, asynAiInt64Average); epicsExportAddress(dset, asynAoInt64); diff --git a/asyn/devEpics/devAsynOctet.c b/asyn/devEpics/devAsynOctet.c index 240e5b89f..2a7c58687 100644 --- a/asyn/devEpics/devAsynOctet.c +++ b/asyn/devEpics/devAsynOctet.c @@ -193,38 +193,38 @@ typedef struct commonDset { } commonDset; commonDset asynSiOctetCmdResponse = { - 5, 0, 0, initSiCmdResponse, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initSiCmdResponse, 0, (DEVSUPFUN)processCommon}; commonDset asynSiOctetWriteRead = { - 5, 0, 0, initSiWriteRead, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initSiWriteRead, 0, (DEVSUPFUN)processCommon}; commonDset asynSiOctetRead = { - 5, 0, 0, initSiRead, getIoIntInfo, processCommon}; + 5, 0, 0, (DEVSUPFUN)initSiRead, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processCommon}; commonDset asynSoOctetWrite = { - 5, 0, 0, initSoWrite, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initSoWrite, 0, (DEVSUPFUN)processCommon}; commonDset asynWfOctetCmdResponse = { - 5, 0, 0, initWfCmdResponse, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initWfCmdResponse, 0, (DEVSUPFUN)processCommon}; commonDset asynWfOctetWriteRead = { - 5, 0, 0, initWfWriteRead, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initWfWriteRead, 0, (DEVSUPFUN)processCommon}; commonDset asynWfOctetRead = { - 5, 0, 0, initWfRead, getIoIntInfo, processCommon}; + 5, 0, 0, (DEVSUPFUN)initWfRead, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processCommon}; commonDset asynWfOctetWrite = { - 5, 0, 0, initWfWrite, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initWfWrite, 0, (DEVSUPFUN)processCommon}; commonDset asynWfOctetWriteBinary = { - 5, 0, 0, initWfWriteBinary, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initWfWriteBinary, 0, (DEVSUPFUN)processCommon}; #ifdef HAVE_LSREC commonDset asynLsiOctetCmdResponse = { - 5, 0, 0, initLsiCmdResponse, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initLsiCmdResponse, 0, (DEVSUPFUN)processCommon}; commonDset asynLsiOctetWriteRead = { - 5, 0, 0, initLsiWriteRead, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initLsiWriteRead, 0, (DEVSUPFUN)processCommon}; commonDset asynLsiOctetRead = { - 5, 0, 0, initLsiRead, getIoIntInfo, processCommon}; + 5, 0, 0, (DEVSUPFUN)initLsiRead, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processCommon}; commonDset asynLsoOctetWrite = { - 5, 0, 0, initLsoWrite, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initLsoWrite, 0, (DEVSUPFUN)processCommon}; commonDset asynPfOctetWrite = { - 5, 0, 0, initPfWrite, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initPfWrite, 0, (DEVSUPFUN)processCommon}; #endif /* HAVE_LSREC */ #ifdef HAVE_CALCMOD commonDset asynScalcoutOctetWrite = { - 5, 0, 0, initScalcoutWrite, 0, processCommon}; + 5, 0, 0, (DEVSUPFUN)initScalcoutWrite, 0, (DEVSUPFUN)processCommon}; #endif /* HAVE_CALCMOD */ epicsExportAddress(dset, asynSiOctetCmdResponse); diff --git a/asyn/devEpics/devAsynUInt32Digital.c b/asyn/devEpics/devAsynUInt32Digital.c index 53a576a3b..238e5a360 100644 --- a/asyn/devEpics/devAsynUInt32Digital.c +++ b/asyn/devEpics/devAsynUInt32Digital.c @@ -151,21 +151,21 @@ typedef struct analogDset { /* analog dset */ } analogDset; analogDset asynBiUInt32Digital = { - 6,0,0,initBi, getIoIntInfo, processBi}; + 6,0,0,(DEVSUPFUN)initBi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processBi}; analogDset asynBoUInt32Digital = { - 6,0,0,initBo, getIoIntInfo, processBo}; + 6,0,0,(DEVSUPFUN)initBo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processBo}; analogDset asynLiUInt32Digital = { - 5,0,0,initLi, getIoIntInfo, processLi}; + 5,0,0,(DEVSUPFUN)initLi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLi}; analogDset asynLoUInt32Digital = { - 5,0,0,initLo, getIoIntInfo, processLo}; + 5,0,0,(DEVSUPFUN)initLo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processLo}; analogDset asynMbbiUInt32Digital = { - 5,0,0,initMbbi, getIoIntInfo, processMbbi}; + 5,0,0,(DEVSUPFUN)initMbbi, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbbi}; analogDset asynMbboUInt32Digital = { - 5,0,0,initMbbo, getIoIntInfo, processMbbo}; + 5,0,0,(DEVSUPFUN)initMbbo, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbbo}; analogDset asynMbbiDirectUInt32Digital = { - 5,0,0,initMbbiDirect, getIoIntInfo, processMbbiDirect}; + 5,0,0,(DEVSUPFUN)initMbbiDirect, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbbiDirect}; analogDset asynMbboDirectUInt32Digital = { - 5,0,0,initMbboDirect, getIoIntInfo, processMbboDirect}; + 5,0,0,(DEVSUPFUN)initMbboDirect, (DEVSUPFUN)getIoIntInfo, (DEVSUPFUN)processMbboDirect}; epicsExportAddress(dset, asynBiUInt32Digital); epicsExportAddress(dset, asynBoUInt32Digital); diff --git a/asyn/devEpics/devAsynXXXTimeSeries.h b/asyn/devEpics/devAsynXXXTimeSeries.h index 7b7baab76..8a9363f24 100644 --- a/asyn/devEpics/devAsynXXXTimeSeries.h +++ b/asyn/devEpics/devAsynXXXTimeSeries.h @@ -48,7 +48,7 @@ typedef struct analogDset { /* analog dset */ \ } analogDset; \ \ analogDset DSET = \ - {6, 0, 0, initRecord, 0, process, 0}; \ + {6, 0, 0, (DEVSUPFUN)initRecord, 0, (DEVSUPFUN)process, 0}; \ \ epicsExportAddress(dset, DSET); \ \ diff --git a/asyn/devGpib/devCommonGpib.c b/asyn/devGpib/devCommonGpib.c index d2bb9764d..4b249d5bf 100644 --- a/asyn/devGpib/devCommonGpib.c +++ b/asyn/devGpib/devCommonGpib.c @@ -38,6 +38,8 @@ #include "devSupportGpib.h" #include "devCommonGpib.h" +typedef long(*special_linconv_t)(void*, int); + /* The following is a generic finish routine for output records */ static void genericFinish(gpibDpvt * pgpibDpvt,int failure) @@ -64,7 +66,7 @@ long devGpib_initAi(aiRecord * pai) pai->pact = TRUE; return S_db_badField; } - if(got_special_linconv) (*got_special_linconv)(pai,TRUE); + if(got_special_linconv) ((special_linconv_t)got_special_linconv)(pai,TRUE); return 0; } @@ -145,7 +147,7 @@ long devGpib_initAo(aoRecord * pao) pao->pact = TRUE; return S_db_badField; } - if(got_special_linconv) (*got_special_linconv)(pao,TRUE); + if(got_special_linconv) ((special_linconv_t)got_special_linconv)(pao,TRUE); return (got_special_linconv ? 0 : 2); } diff --git a/asyn/devGpib/devGpib.h b/asyn/devGpib/devGpib.h index 49ca8b783..8e69981ca 100644 --- a/asyn/devGpib/devGpib.h +++ b/asyn/devGpib/devGpib.h @@ -48,7 +48,7 @@ static devGpibParmBlock devSupParms; static long init_ai(int pass); static gDset DSET_AI = { 6, - {0, init_ai, devGpib_initAi, 0, devGpib_readAi, 0}, + {0, (DEVSUPFUN)init_ai, (DEVSUPFUN)devGpib_initAi, 0, (DEVSUPFUN)devGpib_readAi, 0}, &devSupParms }; epicsExportAddress(dset,DSET_AI); @@ -57,7 +57,7 @@ epicsExportAddress(dset,DSET_AI); static long dummySpecialLinconvAIRAW(struct aiRecord * pai, int after) { return 0; } static gDset DSET_AIRAW = { 6, - {0, init_ai, devGpib_initAi, 0, devGpib_readAi, dummySpecialLinconvAIRAW}, + {0, (DEVSUPFUN)init_ai, (DEVSUPFUN)devGpib_initAi, 0, (DEVSUPFUN)devGpib_readAi, (DEVSUPFUN)dummySpecialLinconvAIRAW}, &devSupParms }; epicsExportAddress(dset,DSET_AIRAW); @@ -66,7 +66,7 @@ epicsExportAddress(dset,DSET_AIRAW); #ifdef DSET_AO static gDset DSET_AO = { 6, - {0, 0, devGpib_initAo, 0, devGpib_writeAo, 0}, + {0, 0, (DEVSUPFUN)devGpib_initAo, 0, (DEVSUPFUN)devGpib_writeAo, 0}, &devSupParms }; epicsExportAddress(dset,DSET_AO); @@ -76,7 +76,7 @@ epicsExportAddress(dset,DSET_AO); static long dummySpecialLinconvAORAW(struct aoRecord * pao, int after) { return 0; } static gDset DSET_AORAW = { 6, - {0, 0, devGpib_initAo, 0, devGpib_writeAo, dummySpecialLinconvAORAW}, + {0, 0, (DEVSUPFUN)devGpib_initAo, 0, (DEVSUPFUN)devGpib_writeAo, (DEVSUPFUN)dummySpecialLinconvAORAW}, &devSupParms }; epicsExportAddress(dset,DSET_AORAW); @@ -85,7 +85,7 @@ epicsExportAddress(dset,DSET_AORAW); #ifdef DSET_BI static gDset DSET_BI = { 6, - {0, 0, devGpib_initBi, 0, devGpib_readBi, 0}, + {0, 0, (DEVSUPFUN)devGpib_initBi, 0, (DEVSUPFUN)devGpib_readBi, 0}, &devSupParms }; epicsExportAddress(dset,DSET_BI); @@ -94,7 +94,7 @@ epicsExportAddress(dset,DSET_BI); #ifdef DSET_BO static gDset DSET_BO = { 6, - {0, 0, devGpib_initBo, 0, devGpib_writeBo,0}, + {0, 0, (DEVSUPFUN)devGpib_initBo, 0, (DEVSUPFUN)devGpib_writeBo,0}, &devSupParms }; epicsExportAddress(dset,DSET_BO); @@ -103,7 +103,7 @@ epicsExportAddress(dset,DSET_BO); #ifdef DSET_EV static gDset DSET_EV = { 6, - {0, 0, devGpib_initEv, 0, devGpib_readEv, 0}, + {0, 0, (DEVSUPFUN)devGpib_initEv, 0, (DEVSUPFUN)devGpib_readEv, 0}, &devSupParms }; epicsExportAddress(dset,DSET_EV); @@ -112,7 +112,7 @@ epicsExportAddress(dset,DSET_EV); #ifdef DSET_LI static gDset DSET_LI = { 6, - {0, 0, devGpib_initLi, 0, devGpib_readLi, 0}, + {0, 0, (DEVSUPFUN)devGpib_initLi, 0, (DEVSUPFUN)devGpib_readLi, 0}, &devSupParms }; epicsExportAddress(dset,DSET_LI); @@ -121,7 +121,7 @@ epicsExportAddress(dset,DSET_LI); #ifdef DSET_LO static gDset DSET_LO = { 6, - {0, 0, devGpib_initLo, 0, devGpib_writeLo,0}, + {0, 0, (DEVSUPFUN)devGpib_initLo, 0, (DEVSUPFUN)devGpib_writeLo,0}, &devSupParms }; epicsExportAddress(dset,DSET_LO); @@ -130,7 +130,7 @@ epicsExportAddress(dset,DSET_LO); #ifdef DSET_MBBI static gDset DSET_MBBI = { 6, - {0, 0, devGpib_initMbbi, 0, devGpib_readMbbi, 0}, + {0, 0, (DEVSUPFUN)devGpib_initMbbi, 0, (DEVSUPFUN)devGpib_readMbbi, 0}, &devSupParms }; epicsExportAddress(dset,DSET_MBBI); @@ -139,7 +139,7 @@ epicsExportAddress(dset,DSET_MBBI); #ifdef DSET_MBBO static gDset DSET_MBBO = { 6, - {0, 0, devGpib_initMbbo, 0, devGpib_writeMbbo,0}, + {0, 0, (DEVSUPFUN)devGpib_initMbbo, 0, (DEVSUPFUN)devGpib_writeMbbo,0}, &devSupParms }; epicsExportAddress(dset,DSET_MBBO); @@ -148,7 +148,7 @@ epicsExportAddress(dset,DSET_MBBO); #ifdef DSET_MBBID static gDset DSET_MBBID = { 6, - {0, 0, devGpib_initMbbiDirect, 0, devGpib_readMbbiDirect,0}, + {0, 0, (DEVSUPFUN)devGpib_initMbbiDirect, 0, (DEVSUPFUN)devGpib_readMbbiDirect,0}, &devSupParms }; epicsExportAddress(dset,DSET_MBBID); @@ -157,7 +157,7 @@ epicsExportAddress(dset,DSET_MBBID); #ifdef DSET_MBBOD static gDset DSET_MBBOD = { 6, - {0, 0, devGpib_initMbboDirect, 0, devGpib_writeMbboDirect,0}, + {0, 0, (DEVSUPFUN)devGpib_initMbboDirect, 0, (DEVSUPFUN)devGpib_writeMbboDirect,0}, &devSupParms }; epicsExportAddress(dset,DSET_MBBOD); @@ -166,7 +166,7 @@ epicsExportAddress(dset,DSET_MBBOD); #ifdef DSET_SI static gDset DSET_SI = { 6, - {0, 0, devGpib_initSi, 0, devGpib_readSi, 0}, + {0, 0, (DEVSUPFUN)devGpib_initSi, 0, (DEVSUPFUN)devGpib_readSi, 0}, &devSupParms }; epicsExportAddress(dset,DSET_SI); @@ -175,7 +175,7 @@ epicsExportAddress(dset,DSET_SI); #ifdef DSET_SO static gDset DSET_SO = { 6, - {0, 0, devGpib_initSo, 0, devGpib_writeSo,0}, + {0, 0, (DEVSUPFUN)devGpib_initSo, 0, (DEVSUPFUN)devGpib_writeSo,0}, &devSupParms }; epicsExportAddress(dset,DSET_SO); @@ -184,7 +184,7 @@ epicsExportAddress(dset,DSET_SO); #ifdef DSET_WF static gDset DSET_WF = { 6, - {0, 0, devGpib_initWf, 0, devGpib_readWf, 0}, + {0, 0, (DEVSUPFUN)devGpib_initWf, 0, (DEVSUPFUN)devGpib_readWf, 0}, &devSupParms }; epicsExportAddress(dset,DSET_WF); diff --git a/asyn/devGpib/devSupportGpib.c b/asyn/devGpib/devSupportGpib.c index f7059030b..7108b0d45 100644 --- a/asyn/devGpib/devSupportGpib.c +++ b/asyn/devGpib/devSupportGpib.c @@ -1554,7 +1554,7 @@ static long report(int interest) static gDset devGpib= { 6, - {report,init,0,0,0,0}, + {(DEVSUPFUN)report,(DEVSUPFUN)init,0,0,0,0}, 0 }; epicsExportAddress(dset,devGpib); diff --git a/testApp/src/devTestBlock.c b/testApp/src/devTestBlock.c index 7a357346f..7952328be 100644 --- a/testApp/src/devTestBlock.c +++ b/testApp/src/devTestBlock.c @@ -96,7 +96,7 @@ typedef struct commonDset { } commonDset; commonDset devTestBlockInp = { - 5,0,0,initSiWriteRead, 0 ,processCommon}; + 5,0,0,(DEVSUPFUN)initSiWriteRead, 0 ,(DEVSUPFUN)processCommon}; epicsExportAddress(dset, devTestBlockInp);