diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-06-02 11:39:46 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-06-02 11:39:46 +0000 |
| commit | 0993dcfecd288fc8917db05a6259ba91dd5d2369 (patch) | |
| tree | db98f116ac229e70cd89c6139215de99920acacd /vos | |
| parent | e39fd9b2908bfc3d61b257c93e213063004136fe (diff) | |
INTEGRATION: CWS vgcleanupmacros (1.2.18); FILE MERGED
2006/05/17 11:23:18 vg 1.2.18.1: #i65486# cleanup:remove obsolete macros
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/inc/vos/signal.hxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/vos/inc/vos/signal.hxx b/vos/inc/vos/signal.hxx index 55a0e846ffed..2d045f98c6bd 100644 --- a/vos/inc/vos/signal.hxx +++ b/vos/inc/vos/signal.hxx @@ -4,9 +4,9 @@ * * $RCSfile: signal.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-09 09:04:15 $ + * last change: $Author: vg $ $Date: 2006-06-02 12:39:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,12 +49,10 @@ extern oslSignalAction SAL_CALL _OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); -#ifdef _USE_NAMESPACE namespace vos { -#endif -#if defined ( _USE_NAMESPACE ) && !defined ( WNT ) +#if !defined ( WNT ) oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); #endif @@ -107,20 +105,16 @@ protected: protected: oslSignalHandler m_hHandler; -#if defined ( _USE_NAMESPACE ) && defined ( WNT ) +#if defined ( WNT ) friend oslSignalAction SAL_CALL ::_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); -#elif defined ( _USE_NAMESPACE ) - friend oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); #else - friend oslSignalAction SAL_CALL _OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); + friend oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); #endif }; -#ifdef _USE_NAMESPACE } -#endif #endif // _VOS_SIGNAL_HXX_ |