diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp index 0217883cc..c7a035437 100644 --- a/src/ca/cac.cpp +++ b/src/ca/cac.cpp @@ -831,11 +831,11 @@ void cac::writeRequest ( nciu &chan, unsigned type, unsigned nElem, const void * } cacChannel::ioid cac::writeNotifyRequest ( nciu &chan, unsigned type, unsigned nElem, - const void *pValue, cacWriteNotify ¬ify ) + const void *pValue, cacWriteNotify ¬ifyIn ) { epicsAutoMutex autoMutex ( this->mutex ); autoPtrRecycle < netWriteNotifyIO > pIO ( *this, netWriteNotifyIO::factory ( - this->freeListWriteNotifyIO, chan, notify ) ); + this->freeListWriteNotifyIO, chan, notifyIn ) ); if ( pIO.get() ) { this->ioTable.add ( *pIO ); chan.cacPrivateListOfIO::eventq.add ( *pIO ); @@ -849,11 +849,11 @@ cacChannel::ioid cac::writeNotifyRequest ( nciu &chan, unsigned type, unsigned n } } -cacChannel::ioid cac::readNotifyRequest ( nciu &chan, unsigned type, unsigned nElem, cacReadNotify ¬ify ) +cacChannel::ioid cac::readNotifyRequest ( nciu &chan, unsigned type, unsigned nElem, cacReadNotify ¬ifyIn ) { epicsAutoMutex autoMutex ( this->mutex ); autoPtrRecycle < netReadNotifyIO > pIO ( *this, netReadNotifyIO::factory ( - this->freeListReadNotifyIO, chan, notify ) ); + this->freeListReadNotifyIO, chan, notifyIn ) ); if ( pIO.get() ) { this->flushIfRequired ( chan ); this->ioTable.add ( *pIO ); @@ -1153,11 +1153,11 @@ void cac::recycleSubscription ( netSubscription &io ) } cacChannel::ioid cac::subscriptionRequest ( nciu &chan, unsigned type, - unsigned long nElem, unsigned mask, cacStateNotify ¬ify ) + unsigned long nElem, unsigned mask, cacStateNotify ¬ifyIn ) { epicsAutoMutex autoMutex ( this->mutex ); autoPtrRecycle < netSubscription > pIO ( *this, netSubscription::factory ( - this->freeListSubscription, chan, type, nElem, mask, notify ) ); + this->freeListSubscription, chan, type, nElem, mask, notifyIn ) ); if ( pIO.get() ) { chan.cacPrivateListOfIO::eventq.add ( *pIO ); this->ioTable.add ( *pIO ); diff --git a/src/ca/repeater.cpp b/src/ca/repeater.cpp index c61112a6f..93b267710 100644 --- a/src/ca/repeater.cpp +++ b/src/ca/repeater.cpp @@ -569,7 +569,7 @@ void ca_repeater () /* * caRepeaterThread () */ -void caRepeaterThread ( void * /* pDummy */ ) +extern "C" void caRepeaterThread ( void * /* pDummy */ ) { taskwdInsert ( epicsThreadGetIdSelf(), NULL, NULL ); ca_repeater (); diff --git a/src/ca/udpiiu.h b/src/ca/udpiiu.h index d4519d107..8da28c133 100644 --- a/src/ca/udpiiu.h +++ b/src/ca/udpiiu.h @@ -36,7 +36,7 @@ extern "C" void cacRecvThreadUDP ( void *pParam ); epicsShareFunc void epicsShareAPI caStartRepeaterIfNotInstalled ( unsigned repeaterPort ); epicsShareFunc void epicsShareAPI caRepeaterRegistrationMessage ( SOCKET sock, unsigned repeaterPort, unsigned attemptNumber ); -epicsShareFunc void caRepeaterThread ( void *pDummy ); +extern "C" epicsShareFunc void caRepeaterThread ( void *pDummy ); epicsShareFunc void ca_repeater ( void ); class udpiiu : public netiiu {