diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 10:21:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 10:21:56 +0000 |
| commit | de5a4e60eff87a5d1613cccf584de56d0022ebca (patch) | |
| tree | e9e4204d9e4b82a038e7d02c67e7d8278a0a5c26 /vos/source | |
| parent | 3a80b325f2e5c61b65bcfbdfbc554babe817750f (diff) | |
INTEGRATION: CWS warnings01 (1.1.1.1.148); FILE MERGED
2005/09/23 00:19:06 sb 1.1.1.1.148.4: RESYNC: (1.1.1.1-1.2); FILE MERGED
2005/09/09 07:56:49 sb 1.1.1.1.148.3: #i53898# Improved previous change.
2005/09/08 14:08:42 sb 1.1.1.1.148.2: #i53898# Simplified previous change.
2005/09/07 16:34:15 sb 1.1.1.1.148.1: #i53898# Made code warning-free.
Diffstat (limited to 'vos/source')
| -rw-r--r-- | vos/source/signal.cxx | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/vos/source/signal.cxx b/vos/source/signal.cxx index 0bf17169b876..03ca4b20f0bf 100644 --- a/vos/source/signal.cxx +++ b/vos/source/signal.cxx @@ -4,9 +4,9 @@ * * $RCSfile: signal.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2006-06-02 12:44:00 $ + * last change: $Author: hr $ $Date: 2006-06-20 11:21:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,28 +38,16 @@ #include <vos/object.hxx> #include <vos/signal.hxx> -#if !defined ( WNT ) - -oslSignalAction SAL_CALL _OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo) -{ - return NAMESPACE_VOS(_cpp_OSignalHandler_Function)(pthis, pInfo); -} - -oslSignalAction NAMESPACE_VOS(_cpp_OSignalHandler_Function)(void* pthis, oslSignalInfo* pInfo) - -#else - -static oslSignalAction SAL_CALL _OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo) +using namespace vos; -#endif +oslSignalAction vos::signalHandlerFunction_impl( + void * pthis, oslSignalInfo * pInfo) { NAMESPACE_VOS(OSignalHandler)* pThis= (NAMESPACE_VOS(OSignalHandler)*)pthis; return ((oslSignalAction)pThis->signal(pInfo)); } -using namespace vos; - ///////////////////////////////////////////////////////////////////////////// // Thread class @@ -69,7 +57,7 @@ VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OSignalHandler, vos), OSignalHandler::OSignalHandler() { - m_hHandler = osl_addSignalHandler(_OSignalHandler_Function, this); + m_hHandler = osl_addSignalHandler(signalHandlerFunction_impl, this); } OSignalHandler::~OSignalHandler() |