more changes to get epicsShare to work on win32

src/dev/softDev/devAiSoft.c

@@ -33,7 +33,7 @@
 /* Create the dset for devAiSoft */
 static long init_record();
 static long read_ai();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -50,6 +50,7 @@ epicsShareDef struct {
 	read_ai,
 	NULL
 };
+epicsShareDef dset *pdevAiSoft = (dset *)&devAiSoft;
 
 static long init_record(aiRecord *pai)
 {

src/dev/softDev/devAiSoftRaw.c

@@ -34,7 +34,7 @@
 /* Create the dset for devAiSoftRaw */
 static long init_record(aiRecord *pai);
 static long read_ai(aiRecord *pai);
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -51,6 +51,7 @@ epicsShareDef struct {
 	read_ai,
 	NULL
 };
+epicsShareDef dset *pdevAiSoftRaw = (dset *)&devAiSoftRaw;
 
 static long init_record(aiRecord *pai)
 {

src/dev/softDev/devAoSoft.c

@@ -38,7 +38,7 @@ static long init_record();
 
 /* Create the dset for devAoSoft */
 static long write_ao();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -54,6 +54,7 @@ epicsShareDef struct {
 	NULL,
 	write_ao,
 	NULL};
+epicsShareDef dset *pdevAoSoft = (dset *)&devAoSoft;
 
 
 static long init_record(aoRecord *pao)

src/dev/softDev/devAoSoftRaw.c

@@ -35,7 +35,7 @@
 
 /* Create the dset for devAoSoftRaw */
 static long write_ao(aoRecord *pao);
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -51,6 +51,7 @@ epicsShareDef struct {
 	NULL,
 	write_ao,
 	NULL};
+epicsShareDef dset *pdevAoSoftRaw = (dset *)&devAoSoftRaw;
 
 static long write_ao(aoRecord *pao)
 {

src/dev/softDev/devBiSoft.c

@@ -31,7 +31,7 @@
 /* Create the dset for devBiSoft */
 static long init_record();
 static long read_bi();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -46,6 +46,7 @@ epicsShareDef struct {
 	NULL,
 	read_bi
 };
+epicsShareDef dset *pdevBiSoft = (dset *)&devBiSoft;
 
 static long init_record(biRecord *pbi)
 {

src/dev/softDev/devBiSoftRaw.c

@@ -31,7 +31,7 @@
 /* Create the dset for devBiSoftRaw */
 static long init_record();
 static long read_bi();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -46,6 +46,7 @@ epicsShareDef struct {
 	NULL,
 	read_bi
 };
+epicsShareDef dset *pdevBiSoftRaw = (dset *)&devBiSoftRaw;
 
 static long init_record(biRecord *pbi)
 {

src/dev/softDev/devBoSoft.c

@@ -38,7 +38,7 @@ static long init_record();
 /* Create the dset for devBoSoft */
 static long write_bo();
 
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -52,6 +52,7 @@ epicsShareDef struct {
 	init_record,
 	NULL,
 	write_bo};
+epicsShareDef dset *pdevBoSoft = (dset *)&devBoSoft;
 
 static long init_record(boRecord *pbo)
 {

src/dev/softDev/devBoSoftRaw.c

@@ -38,7 +38,7 @@ static long init_record();
 /* Create the dset for devBoSoftRaw */
 static long write_bo();
 
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -52,6 +52,7 @@ epicsShareDef struct {
 	init_record,
 	NULL,
 	write_bo};
+epicsShareDef dset *pdevBoSoftRaw = (dset *)&devBoSoftRaw;
 
 
 

src/dev/softDev/devEventSoft.c

@@ -31,7 +31,7 @@
 /* Create the dset for devEventSoft */
 static long init_record();
 static long read_event();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -46,6 +46,7 @@ epicsShareDef struct {
 	NULL,
 	read_event
 };
+epicsShareDef dset *pdevEventSoft = (dset *)&devEventSoft;
 
 static long init_record(eventRecord *pevent)
 {

src/dev/softDev/devHistogramSoft.c

@@ -32,7 +32,7 @@
 /* Create the dset for devHistogramSoft */
 static long init_record();
 static long read_histogram();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -49,6 +49,7 @@ epicsShareDef struct {
 	read_histogram,
 	NULL
 };
+epicsShareDef dset *pdevHistogramSoft = (dset *)&devHistogramSoft;
 
 static long init_record(histogramRecord	*phistogram)
 {

src/dev/softDev/devLiSoft.c

@@ -32,7 +32,7 @@
 static long init_record();
 static long read_longin();
 
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -47,6 +47,7 @@ epicsShareDef struct {
 	NULL,
 	read_longin
 };
+epicsShareDef dset *pdevLiSoft = (dset *)&devLiSoft;
 
 static long init_record(longinRecord *plongin)
 {

src/dev/softDev/devLoSoft.c

@@ -30,7 +30,7 @@
 /* Create the dset for devLoSoft */
 static long init_record();
 static long write_longout();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -45,6 +45,7 @@ epicsShareDef struct {
 	NULL,
 	write_longout
 };
+epicsShareDef dset *pdevLoSoft = (dset *)&devLoSoft;
 
 static long init_record(longoutRecord *plongout)
 {

src/dev/softDev/devMbbiDirectSoft.c

@@ -31,7 +31,7 @@
 /* Create the dset for devMbbiSoft */
 static long init_record();
 static long read_mbbi();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -46,6 +46,7 @@ epicsShareDef struct {
 	NULL,
 	read_mbbi
 };
+epicsShareDef dset *pdevMbbiDirectSoft = (dset *)&devMbbiDirectSoft;
 
 static long init_record(mbbiDirectRecord *pmbbi)
 {

src/dev/softDev/devMbbiDirectSoftRaw.c

@@ -31,7 +31,7 @@
 /* Create the dset for devMbbiDirectSoftRaw */
 static long init_record();
 static long read_mbbi();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -46,6 +46,7 @@ epicsShareDef struct {
 	NULL,
 	read_mbbi
 };
+epicsShareDef dset *pdevMbbiDirectSoftRaw = (dset *)&devMbbiDirectSoftRaw;
 
 static long init_record(mbbiDirectRecord *pmbbi)
 {

src/dev/softDev/devMbbiSoft.c

@@ -31,7 +31,7 @@
 /* Create the dset for devMbbiSoft */
 static long init_record();
 static long read_mbbi();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -46,6 +46,7 @@ epicsShareDef struct {
 	NULL,
 	read_mbbi
 };
+epicsShareDef dset *pdevMbbiSoft = (dset *)&devMbbiSoft;
 
 static long init_record(mbbiRecord *pmbbi)
 {

src/dev/softDev/devMbbiSoftRaw.c

@@ -31,7 +31,7 @@
 /* Create the dset for devMbbiSoftRaw */
 static long init_record();
 static long read_mbbi();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -46,6 +46,7 @@ epicsShareDef struct {
 	NULL,
 	read_mbbi
 };
+epicsShareDef dset *pdevMbbiSoftRaw = (dset *)&devMbbiSoftRaw;
 
 static long init_record(mbbiRecord *pmbbi)
 {

src/dev/softDev/devMbboDirectSoft.c

@@ -31,7 +31,7 @@
 /* Create the dset for devMbboSoft */
 static long init_record();
 static long write_mbbo();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -46,6 +46,7 @@ epicsShareDef struct {
 	NULL,
 	write_mbbo
 };
+epicsShareDef dset *pdevMbboDirectSoft = (dset *)&devMbboDirectSoft;
 
 static long init_record(mbboDirectRecord *pmbbo)
 {

src/dev/softDev/devMbboDirectSoftRaw.c

@@ -32,7 +32,7 @@
 /* Create the dset for devMbboDirectSoftRaw */
 static long init_record();
 static long write_mbbo();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -47,6 +47,7 @@ epicsShareDef struct {
 	NULL,
 	write_mbbo
 };
+epicsShareDef dset *pdevMbboDirectSoftRaw = (dset *)&devMbboDirectSoftRaw;
 
 static long init_record(mbboDirectRecord *pmbbo)
 {

src/dev/softDev/devMbboSoft.c

@@ -31,7 +31,7 @@
 /* Create the dset for devMbboSoft */
 static long init_record();
 static long write_mbbo();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -46,6 +46,7 @@ epicsShareDef struct {
 	NULL,
 	write_mbbo
 };
+epicsShareDef dset *pdevMbboSoft = (dset *)&devMbboSoft;
 
 static long init_record(mbboRecord *pmbbo)
 {

src/dev/softDev/devMbboSoftRaw.c

@@ -30,7 +30,7 @@
 /* Create the dset for devMbboSoftRaw */
 static long init_record();
 static long write_mbbo();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -45,6 +45,7 @@ epicsShareDef struct {
 	NULL,
 	write_mbbo
 };
+epicsShareDef dset *pdevMbboSoftRaw = (dset *)&devMbboSoftRaw;
 
 static long init_record(mbboRecord *pmbbo)
 {

src/dev/softDev/devSASoft.c

@@ -33,7 +33,7 @@ static int sizeofTypes[] = {MAX_STRING_SIZE,1,1,2,2,4,4,4,8,2};
 /* Create the dset for devSASoft */
 static long init_record();
 static long read_sa();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -46,7 +46,9 @@ epicsShareDef struct {
 	NULL,
 	init_record,
 	NULL,
-	read_sa};
+	read_sa
+};
+epicsShareDef dset *pdevSASoft = (dset *)&devSASoft;
 
 
 static long init_record(subArrayRecord *psa)

src/dev/softDev/devSiSoft.c

@@ -32,7 +32,7 @@
 /* Create the dset for devSiSoft */
 static long init_record();
 static long read_stringin();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -47,6 +47,7 @@ epicsShareDef struct {
 	NULL,
 	read_stringin
 };
+epicsShareDef dset *pdevSiSoft = (dset *)&devSiSoft;
 
 static long init_record(stringinRecord *pstringin)
 {

src/dev/softDev/devSoSoft.c

@@ -31,7 +31,7 @@
 /* Create the dset for devSoSoft */
 static long init_record();
 static long write_stringout();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -46,6 +46,7 @@ epicsShareDef struct {
 	NULL,
 	write_stringout
 };
+epicsShareDef dset *pdevSoSoft = (dset *)&devSoSoft;
 
 static long init_record(stringoutRecord *pstringout)
 {

src/dev/softDev/devWfSoft.c

@@ -36,7 +36,7 @@
 /* Create the dset for devWfSoft */
 static long init_record();
 static long read_wf();
-epicsShareDef struct {
+static struct {
 	long		number;
 	DEVSUPFUN	report;
 	DEVSUPFUN	init;
@@ -49,7 +49,9 @@ epicsShareDef struct {
 	NULL,
 	init_record,
 	NULL,
-	read_wf};
+	read_wf
+};
+epicsShareDef dset *pdevWfSoft = (dset *)&devWfSoft;
 
 
 static long init_record(waveformRecord *pwf)