diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 10:17:31 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 10:17:31 +0000 |
| commit | af563562dd484f52f32a1405fc067f03bac3f6ad (patch) | |
| tree | 1a7e0cd15bc8c5d54c0269dc4e26ec9c85027708 /vos | |
| parent | 6d6bec71e56c8181c8839bc0ec3957a72f9ef6d7 (diff) | |
INTEGRATION: CWS warnings01 (1.1.1.1.148); FILE MERGED
2005/09/23 00:15:26 sb 1.1.1.1.148.4: RESYNC: (1.1.1.1-1.2); FILE MERGED
2005/09/09 07:56:48 sb 1.1.1.1.148.3: #i53898# Improved previous change.
2005/09/08 14:08:38 sb 1.1.1.1.148.2: #i53898# Simplified previous change.
2005/09/07 16:34:13 sb 1.1.1.1.148.1: #i53898# Made code warning-free.
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/inc/vos/signal.hxx | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/vos/inc/vos/signal.hxx b/vos/inc/vos/signal.hxx index 2d045f98c6bd..c705c3b82ef8 100644 --- a/vos/inc/vos/signal.hxx +++ b/vos/inc/vos/signal.hxx @@ -4,9 +4,9 @@ * * $RCSfile: signal.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2006-06-02 12:39:46 $ + * last change: $Author: hr $ $Date: 2006-06-20 11:17:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,14 +47,12 @@ # include <osl/signal.h> #endif -extern oslSignalAction SAL_CALL _OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); - namespace vos { -#if !defined ( WNT ) -oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); -#endif +extern "C" +typedef oslSignalAction SignalHandlerFunction_impl(void *, oslSignalInfo *); +SignalHandlerFunction_impl signalHandlerFunction_impl; /** OSignalHandler is an objectoriented interface for signal handlers. @@ -105,13 +103,7 @@ protected: protected: oslSignalHandler m_hHandler; -#if defined ( WNT ) - friend oslSignalAction SAL_CALL ::_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); -#else - friend oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); -#endif - - + friend oslSignalAction signalHandlerFunction_impl(void *, oslSignalInfo *); }; } |