From f32d647482b1e68def0e03cb95fb9ad9c9eb76b9 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Fri, 13 Feb 2004 18:51:42 +0000 Subject: [PATCH] changes to make things build --- src/as/asCa.c | 5 +++-- src/as/asCa.h | 1 - src/registry/registerRecordDeviceDriver.pl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/as/asCa.c b/src/as/asCa.c index 3c1cee4b1..41199b7be 100644 --- a/src/as/asCa.c +++ b/src/as/asCa.c @@ -32,12 +32,13 @@ #include "caeventmask.h" #include "alarm.h" -#define epicsExportSharedSymbols +#include "epicsExport.h" #include "asLib.h" #include "asDbLib.h" #include "asCa.h" -epicsShareDef int asCaDebug = 0; +int asCaDebug = 0; +epicsExportAddress(int,asCaDebug); LOCAL int firstTime = TRUE; LOCAL epicsThreadId threadid=0; LOCAL int caInitializing=FALSE; diff --git a/src/as/asCa.h b/src/as/asCa.h index 587602c8b..8ca2644a8 100644 --- a/src/as/asCa.h +++ b/src/as/asCa.h @@ -21,7 +21,6 @@ extern "C" { epicsShareFunc void epicsShareAPI asCaStart(void); epicsShareFunc void epicsShareAPI asCaStop(void); epicsShareFunc int epicsShareAPI ascar(int level); -epicsShareExtern int asCaDebug; #ifdef __cplusplus } diff --git a/src/registry/registerRecordDeviceDriver.pl b/src/registry/registerRecordDeviceDriver.pl index a539660ae..d316b1741 100755 --- a/src/registry/registerRecordDeviceDriver.pl +++ b/src/registry/registerRecordDeviceDriver.pl @@ -154,7 +154,7 @@ if (@variables) { $argType = $iocshTypes{$varType{$var}}; die "Unknown variable type $varType{$var} for variable $var" unless $argType; - print "\t{\"$var\", $argType, (void * const)p$var},\n"; + print "\t{\"$var\", $argType, (void *)p$var},\n"; } print "\t{NULL, iocshArgInt, NULL}\n};\n\n"; }