From 97636a45e092a531018e481b6ca580e635b20daa Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 16 Dec 2013 14:52:29 -0600 Subject: [PATCH] libCom: Remove epicsShareAPI from epicsExit APIs Passing epicsExitCallAtExits into atexit() was generating a warning about passing in a __stdcall routine pointer. --- src/libCom/misc/epicsExit.c | 10 +++++----- src/libCom/misc/epicsExit.h | 11 +++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/libCom/misc/epicsExit.c b/src/libCom/misc/epicsExit.c index 5992d4ae8..a3835ae0c 100644 --- a/src/libCom/misc/epicsExit.c +++ b/src/libCom/misc/epicsExit.c @@ -83,7 +83,7 @@ static void epicsExitCallAtExitsPvt ( exitPvt * pep ) } } -epicsShareFunc void epicsShareAPI epicsExitCallAtExits ( void ) +epicsShareFunc void epicsExitCallAtExits ( void ) { exitPvt * pep = 0; epicsThreadOnce ( & exitPvtOnce, exitPvtOnceFunc, 0 ); @@ -99,7 +99,7 @@ epicsShareFunc void epicsShareAPI epicsExitCallAtExits ( void ) } } -epicsShareFunc void epicsShareAPI epicsExitCallAtThreadExits ( void ) +epicsShareFunc void epicsExitCallAtThreadExits ( void ) { exitPvt * pep; epicsThreadOnce ( & exitPvtOnce, exitPvtOnceFunc, 0 ); @@ -126,7 +126,7 @@ static int epicsAtExitPvt ( return status; } -epicsShareFunc int epicsShareAPI epicsAtThreadExit ( +epicsShareFunc int epicsAtThreadExit ( epicsExitFunc func, void *arg ) { exitPvt * pep; @@ -142,7 +142,7 @@ epicsShareFunc int epicsShareAPI epicsAtThreadExit ( return epicsAtExitPvt ( pep, func, arg ); } -epicsShareFunc int epicsShareAPI epicsAtExit( +epicsShareFunc int epicsAtExit( epicsExitFunc func, void *arg ) { int status = -1; @@ -155,7 +155,7 @@ epicsShareFunc int epicsShareAPI epicsAtExit( return status; } -epicsShareFunc void epicsShareAPI epicsExit(int status) +epicsShareFunc void epicsExit(int status) { epicsExitCallAtExits(); epicsThreadSleep(1.0); diff --git a/src/libCom/misc/epicsExit.h b/src/libCom/misc/epicsExit.h index 212467368..78b1bcb00 100644 --- a/src/libCom/misc/epicsExit.h +++ b/src/libCom/misc/epicsExit.h @@ -16,13 +16,12 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI epicsExit(int status); -epicsShareFunc void epicsShareAPI epicsExitCallAtExits(void); -epicsShareFunc int epicsShareAPI epicsAtExit( - void (*epicsExitFunc)(void *arg),void *arg); +epicsShareFunc void epicsExit(int status); +epicsShareFunc void epicsExitCallAtExits(void); +epicsShareFunc int epicsAtExit(void (*epicsExitFunc)(void *arg),void *arg); -epicsShareFunc void epicsShareAPI epicsExitCallAtThreadExits(void); -epicsShareFunc int epicsShareAPI epicsAtThreadExit( +epicsShareFunc void epicsExitCallAtThreadExits(void); +epicsShareFunc int epicsAtThreadExit( void (*epicsExitFunc)(void *arg),void *arg);