diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 01:26:24 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:36 -0500 |
| commit | 407f8c9293b95106ed8ca1ea09d000d975a8583d (patch) | |
| tree | 93663370e7e0550f2d01b410b549e6fa24b09c4e /tools | |
| parent | 8daf7c66c52cfecc650904415d61a38a0797f6e6 (diff) | |
merge vosremoval-signal patch
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/pch/precompiled_tools.hxx | 2 | ||||
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/tools/inc/pch/precompiled_tools.hxx b/tools/inc/pch/precompiled_tools.hxx index ac54df5838f3..b38c883d8a43 100644 --- a/tools/inc/pch/precompiled_tools.hxx +++ b/tools/inc/pch/precompiled_tools.hxx @@ -63,6 +63,7 @@ #include "osl/mutex.hxx" #include "osl/process.h" #include "osl/security.h" +#include "osl/signal.h" #include "osl/thread.h" #include "rtl/alloc.h" @@ -87,7 +88,6 @@ #include "vos/macros.hxx" #include "vos/mutex.hxx" #include "vos/process.hxx" -#include "vos/signal.hxx" #include "vos/timer.hxx" //---MARKER--- #endif diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index e5bb64c5b253..110b62aaf4ed 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -32,7 +32,6 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> -#include <vos/signal.hxx> #include <tools/debug.hxx> #include <tools/table.hxx> #include <tools/stream.hxx> @@ -44,6 +43,7 @@ #include <osl/thread.h> #include <osl/file.hxx> #include <osl/mutex.hxx> +#include <osl/signal.h> #include <rtl/ustrbuf.hxx> #include <tools/urlobj.hxx> #include <rtl/instance.hxx> @@ -836,19 +836,20 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr, static void RscException_Impl() { - switch ( NAMESPACE_VOS(OSignalHandler)::raise( OSL_SIGNAL_USER_RESOURCEFAILURE, (void*)"" ) ) + switch ( osl_raiseSignal( OSL_SIGNAL_USER_RESOURCEFAILURE, (void*)"" ) ) { - case NAMESPACE_VOS(OSignalHandler)::TAction_CallNextHandler: - abort(); + case osl_Signal_ActCallNextHdl: + abort(); - case NAMESPACE_VOS(OSignalHandler)::TAction_Ignore: - return; + case osl_Signal_ActIgnore: + return; - case NAMESPACE_VOS(OSignalHandler)::TAction_AbortApplication: - abort(); + case osl_Signal_ActAbortApp: + abort(); - case NAMESPACE_VOS(OSignalHandler)::TAction_KillApplication: - exit(-1); + default: + case osl_Signal_ActKillApp: + exit(-1); } } |