epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

libCom: Remove epicsShareAPI from epicsExit APIs

Browse Source 
Passing epicsExitCallAtExits into atexit() was generating
a warning about passing in a __stdcall routine pointer.
This commit is contained in:
Andrew Johnson
2013-12-16 14:52:29 -06:00
parent a50c66b6ff
commit 97636a45e0
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libCom/misc/epicsExit.c
View File

@@ -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);

11
src/libCom/misc/epicsExit.h
View File

@@ -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);