diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 10:18:52 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 10:18:52 +0000 |
| commit | 3a80b325f2e5c61b65bcfbdfbc554babe817750f (patch) | |
| tree | f50c70096e5854b55609a1b015cf677c1e5a0056 /vos | |
| parent | af563562dd484f52f32a1405fc067f03bac3f6ad (diff) | |
INTEGRATION: CWS warnings01 (1.4.136); FILE MERGED
2005/09/23 00:16:03 sb 1.4.136.4: RESYNC: (1.4-1.5); FILE MERGED
2005/09/09 07:56:48 sb 1.4.136.3: #i53898# Improved previous change.
2005/09/08 14:08:39 sb 1.4.136.2: #i53898# Simplified previous change.
2005/09/07 16:34:14 sb 1.4.136.1: #i53898# Made code warning-free.
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/inc/vos/thread.hxx | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/vos/inc/vos/thread.hxx b/vos/inc/vos/thread.hxx index d0c17d9a26d2..aef324e4279d 100644 --- a/vos/inc/vos/thread.hxx +++ b/vos/inc/vos/thread.hxx @@ -4,9 +4,9 @@ * * $RCSfile: thread.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2006-06-02 12:40:37 $ + * last change: $Author: hr $ $Date: 2006-06-20 11:18:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,14 +56,11 @@ #include <osl/time.h> #endif -extern void SAL_CALL _OThread_WorkerFunction(void* pthis); - namespace vos { -#if defined ( UNX ) -void SAL_CALL _cpp_OThread_WorkerFunction(void* pthis); -#endif +extern "C" typedef void ThreadWorkerFunction_impl(void *); +ThreadWorkerFunction_impl threadWorkerFunction_impl; /** OThread is an objectoriented interface for threads. This class should be the base class for all objects using threads. The @@ -223,13 +220,7 @@ protected: oslThread m_hThread; sal_Bool m_bTerminating; -#if defined ( WNT ) && !defined(GCC) - friend static void ::_OThread_WorkerFunction(void* pthis); -#else - friend void _cpp_OThread_WorkerFunction(void* pthis); -#endif - - + friend void threadWorkerFunction_impl(void *); }; class OThreadData : public NAMESPACE_VOS(OObject) |