diff --git a/src/libCom/timer/epicsTimer.cpp b/src/libCom/timer/epicsTimer.cpp index e50e2e299..81f9b7071 100644 --- a/src/libCom/timer/epicsTimer.cpp +++ b/src/libCom/timer/epicsTimer.cpp @@ -50,13 +50,13 @@ private: class epicsTimerQueueNotifyForC : public epicsTimerQueueNotify { public: - epicsTimerQueueNotifyForC ( epicsTimerQueueReschedualCallback pCallback, void *pPrivate ); + epicsTimerQueueNotifyForC ( epicsTimerQueueRescheduleCallback pCallback, void *pPrivate ); void * operator new ( size_t size ); void operator delete ( void *pCadaver, size_t size ); protected: virtual ~epicsTimerQueueNotifyForC (); private: - epicsTimerQueueReschedualCallback pCallback; + epicsTimerQueueRescheduleCallback pCallback; void *pPrivate; void reschedule (); static tsFreeList < epicsTimerQueueNotifyForC > freeList; @@ -98,7 +98,7 @@ inline void epicsTimerQueueNotifyForC::operator delete ( void *pCadaver, size_t } -epicsTimerQueueNotifyForC::epicsTimerQueueNotifyForC ( epicsTimerQueueReschedualCallback pCallbackIn, void *pPrivateIn ) : +epicsTimerQueueNotifyForC::epicsTimerQueueNotifyForC ( epicsTimerQueueRescheduleCallback pCallbackIn, void *pPrivateIn ) : pCallback ( pCallbackIn ), pPrivate ( pPrivateIn ) {} epicsTimerQueueNotifyForC::~epicsTimerQueueNotifyForC () {} @@ -109,7 +109,7 @@ void epicsTimerQueueNotifyForC::reschedule () } extern "C" epicsTimerQueueNonThreadedId epicsShareAPI - epicsTimerQueueNonThreadedCreate ( epicsTimerQueueReschedualCallback pCallbackIn, void *pPrivateIn ) + epicsTimerQueueNonThreadedCreate ( epicsTimerQueueRescheduleCallback pCallbackIn, void *pPrivateIn ) { try { epicsTimerQueueNotifyForC *pNotify = new epicsTimerQueueNotifyForC ( pCallbackIn, pPrivateIn ); diff --git a/src/libCom/timer/epicsTimer.h b/src/libCom/timer/epicsTimer.h index ef7e801e7..1639f8408 100644 --- a/src/libCom/timer/epicsTimer.h +++ b/src/libCom/timer/epicsTimer.h @@ -115,9 +115,9 @@ epicsShareFunc void epicsShareAPI /* non-threaded timer queue management */ typedef struct epicsTimerQueueNonThreaded * epicsTimerQueueNonThreadedId; -typedef void ( *epicsTimerQueueReschedualCallback ) ( void *pPrivate ); +typedef void ( *epicsTimerQueueRescheduleCallback ) ( void *pPrivate ); epicsShareFunc epicsTimerQueueNonThreadedId epicsShareAPI - epicsTimerQueueNonThreadedCreate ( epicsTimerQueueReschedualCallback, void *pPrivate ); + epicsTimerQueueNonThreadedCreate ( epicsTimerQueueRescheduleCallback, void *pPrivate ); epicsShareFunc void epicsShareAPI epicsTimerQueueNonThreadedDestroy ( epicsTimerQueueNonThreadedId ); epicsShareFunc void epicsShareAPI