From bcbcf05110ca608c1482aab9713481d9462003cc Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Tue, 31 Aug 2004 17:57:00 +0000 Subject: [PATCH] atReboot calls epicsExitCallAtExits not epicsExit --- src/libCom/misc/epicsExit.c | 3 --- src/libCom/osi/os/vxWorks/atReboot.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/libCom/misc/epicsExit.c b/src/libCom/misc/epicsExit.c index 336f62f75..dc0a0193c 100644 --- a/src/libCom/misc/epicsExit.c +++ b/src/libCom/misc/epicsExit.c @@ -72,10 +72,7 @@ epicsShareFunc void epicsShareAPI epicsExit(int status) { epicsExitCallAtExits(); epicsThreadSleep(1.0); - /* for vxWorks exit only terminates calling thread*/ -#ifndef vxWorks exit(status); -#endif } epicsShareFunc int epicsShareAPI epicsAtExit(epicsExitFunc func, void *arg) diff --git a/src/libCom/osi/os/vxWorks/atReboot.cpp b/src/libCom/osi/os/vxWorks/atReboot.cpp index 3d589c5c8..803921df6 100644 --- a/src/libCom/osi/os/vxWorks/atReboot.cpp +++ b/src/libCom/osi/os/vxWorks/atReboot.cpp @@ -24,7 +24,7 @@ typedef int (*sysAtReboot)(void(func)(void)); extern "C" { static void atReboot(void) { - epicsExit(0); + epicsExitCallAtExits(); } } /* extern "C" */