diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-06-02 11:40:37 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-06-02 11:40:37 +0000 |
| commit | eecfdf1eb5e81f8b38b1f46acd3a000fc48e2c48 (patch) | |
| tree | e5f3ffa67fce4e0cda1e50085e79fe000918c812 /vos | |
| parent | 6b71d9887a8fb7f263cd6130fa79980bb113829a (diff) | |
INTEGRATION: CWS vgcleanupmacros (1.5.18); FILE MERGED
2006/05/17 11:23:19 vg 1.5.18.1: #i65486# cleanup:remove obsolete macros
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/inc/vos/thread.hxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/vos/inc/vos/thread.hxx b/vos/inc/vos/thread.hxx index eb44a4462556..d0c17d9a26d2 100644 --- a/vos/inc/vos/thread.hxx +++ b/vos/inc/vos/thread.hxx @@ -4,9 +4,9 @@ * * $RCSfile: thread.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-09 09:05:07 $ + * last change: $Author: vg $ $Date: 2006-06-02 12:40:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,12 +58,10 @@ extern void SAL_CALL _OThread_WorkerFunction(void* pthis); -#ifdef _USE_NAMESPACE namespace vos { -#endif -#if defined ( _USE_NAMESPACE ) && defined ( UNX ) +#if defined ( UNX ) void SAL_CALL _cpp_OThread_WorkerFunction(void* pthis); #endif @@ -225,12 +223,10 @@ protected: oslThread m_hThread; sal_Bool m_bTerminating; -#if defined ( _USE_NAMESPACE ) && defined ( WNT ) && !defined(GCC) +#if defined ( WNT ) && !defined(GCC) friend static void ::_OThread_WorkerFunction(void* pthis); -#elif defined ( _USE_NAMESPACE ) - friend void _cpp_OThread_WorkerFunction(void* pthis); #else - friend void _OThread_WorkerFunction(void* pthis); + friend void _cpp_OThread_WorkerFunction(void* pthis); #endif @@ -262,9 +258,7 @@ protected: oslThreadKey m_hKey; }; -#ifdef _USE_NAMESPACE } -#endif #endif // _VOS_THREAD_HXX_ |