diff --git a/modules/database/src/std/Makefile b/modules/database/src/std/Makefile index d8eb39bdb..3aee75078 100644 --- a/modules/database/src/std/Makefile +++ b/modules/database/src/std/Makefile @@ -11,7 +11,7 @@ TOP = ../../../.. include $(TOP)/configure/CONFIG -USR_CPPFLAGS += -DUSE_TYPED_RSET +USR_CPPFLAGS += -DUSE_TYPED_RSET -DUSE_TYPED_DSET SHRLIB_VERSION = 3.17.0 diff --git a/modules/database/src/std/dev/Makefile b/modules/database/src/std/dev/Makefile index b582f0b47..1412f217c 100644 --- a/modules/database/src/std/dev/Makefile +++ b/modules/database/src/std/dev/Makefile @@ -13,116 +13,63 @@ SRC_DIRS += $(STDDIR)/dev DBD += devSoft.dbd -devAaiSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devAaiSoft.c -devAaoSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devAaoSoft.c -devAiSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devAiSoft.c -devAiSoftRaw_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devAiSoftRaw.c -devAoSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devAoSoft.c -devAoSoftRaw_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devAoSoftRaw.c -devBiSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devBiSoft.c dbRecStd_SRCS += devBiSoftRaw.c -devBiDbState_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devBiDbState.c -devBoSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devBoSoft.c -devBoSoftRaw_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devBoSoftRaw.c dbRecStd_SRCS += devBoDbState.c -devCalcoutSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devCalcoutSoft.c -devEventSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devEventSoft.c -devHistogramSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devHistogramSoft.c -devI64inSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devI64inSoft.c -devI64outSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devI64outSoft.c -devLiSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devLiSoft.c -devLoSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devLoSoft.c -devLsiSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devLsiSoft.c -devLsoSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devLsoSoft.c -devMbbiDirectSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbbiDirectSoft.c -devMbbiDirectSoftRaw_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbbiDirectSoftRaw.c -devMbbiSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbbiSoft.c -devMbbiSoftRaw_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbbiSoftRaw.c -devMbboDirectSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbboDirectSoft.c -devMbboDirectSoftRaw_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbboDirectSoftRaw.c -devMbboSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbboSoft.c -devMbboSoftRaw_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbboSoftRaw.c -devPrintfSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devPrintfSoft.c -devSASoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devSASoft.c -devSiSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devSiSoft.c -devSoSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devSoSoft.c -devWfSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devWfSoft.c -devAiSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devAiSoftCallback.c -devBiSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devBiSoftCallback.c -devI64inSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devI64inSoftCallback.c -devLiSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devLiSoftCallback.c -devMbbiDirectSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbbiDirectSoftCallback.c -devMbbiCallbackSoft_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbbiSoftCallback.c -devSiSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devSiSoftCallback.c -devAoSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devAoSoftCallback.c -devBoSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devBoSoftCallback.c -devCalcoutSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devCalcoutSoftCallback.c -devI64outSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devI64outSoftCallback.c -devLoSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devLoSoftCallback.c -devLsoSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devLsoSoftCallback.c -devMbboSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbboSoftCallback.c -devMbboDirectSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devMbboDirectSoftCallback.c -devPrintfSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devPrintfSoftCallback.c -devSoSoftCallback_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devSoSoftCallback.c -devGeneralTime_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devGeneralTime.c -devTimestamp_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devTimestamp.c -devStdio_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devStdio.c -devEnviron_CFLAGS += -DUSE_TYPED_DSET dbRecStd_SRCS += devEnviron.c dbRecStd_SRCS += asSubRecordFunctions.c diff --git a/modules/database/src/std/dev/devBoSoft.c b/modules/database/src/std/dev/devBoSoft.c index 80ca61b81..b86454252 100644 --- a/modules/database/src/std/dev/devBoSoft.c +++ b/modules/database/src/std/dev/devBoSoft.c @@ -41,7 +41,6 @@ epicsExportAddress(dset, devBoSoft); static long init_record(dbCommon *pcommon) { - boRecord *prec = (boRecord *)pcommon; long status=0; /* dont convert */ diff --git a/modules/database/src/std/rec/Makefile b/modules/database/src/std/rec/Makefile index 51f54dbdf..87021987e 100644 --- a/modules/database/src/std/rec/Makefile +++ b/modules/database/src/std/rec/Makefile @@ -11,62 +11,39 @@ SRC_DIRS += $(STDDIR)/rec -aaiRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += aaiRecord -aaoRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += aaoRecord -aiRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += aiRecord -aoRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += aoRecord stdRecords += aSubRecord -biRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += biRecord -boRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += boRecord stdRecords += calcRecord -calcoutRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += calcoutRecord stdRecords += compressRecord stdRecords += dfanoutRecord -eventRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += eventRecord stdRecords += fanoutRecord -histogramRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += histogramRecord -int64inRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += int64inRecord -int64outRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += int64outRecord -longinRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += longinRecord -longoutRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += longoutRecord -lsiRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += lsiRecord -lsoRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += lsoRecord -mbbiRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += mbbiRecord -mbbiDirectRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += mbbiDirectRecord -mbboRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += mbboRecord -mbboDirectRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += mbboDirectRecord stdRecords += permissiveRecord -printfRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += printfRecord stdRecords += selRecord stdRecords += seqRecord stdRecords += stateRecord stdRecords += stringinRecord -stringoutRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += stringoutRecord stdRecords += subRecord -subArrayRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += subArrayRecord -waveformRecord_CFLAGS += -DUSE_TYPED_DSET stdRecords += waveformRecord DBDINC += $(stdRecords)