diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:49:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:49:41 +0000 |
| commit | 22d6c90e0aec24d283de2b0506b8656865c76e7b (patch) | |
| tree | 39fbc4368e2b3081cdf357fef4bd1f06c8cb6db5 /sal/osl/w32 | |
| parent | 8f6de25b15ddaf13de81b776235f579114a95b02 (diff) | |
INTEGRATION: CWS sb71 (1.18.246); FILE MERGED
2007/08/21 10:42:48 hro 1.18.246.1: #i77184# CoInitializeEx is available on Windows base line (98) so no need to check for DCOM update
Diffstat (limited to 'sal/osl/w32')
| -rw-r--r-- | sal/osl/w32/thread.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/sal/osl/w32/thread.c b/sal/osl/w32/thread.c index 3a93868a6433..e39733f307a8 100644 --- a/sal/osl/w32/thread.c +++ b/sal/osl/w32/thread.c @@ -4,9 +4,9 @@ * * $RCSfile: thread.c,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: rt $ $Date: 2005-09-08 15:13:03 $ + * last change: $Author: vg $ $Date: 2007-10-15 12:49:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -59,11 +59,6 @@ typedef struct _osl_TThreadImpl static unsigned __stdcall oslWorkerWrapperFunction(void* pData); static oslThread oslCreateThread(oslWorkerFunction pWorker, void* pThreadData, sal_uInt32 nFlags); -static HRESULT WINAPI osl_CoInitializeEx(LPVOID pvReserved, DWORD dwCoInit); - -typedef HRESULT (WINAPI *CoInitializeEx_PROC)(LPVOID pvReserved, DWORD dwCoInit); - -CoInitializeEx_PROC _CoInitializeEx = osl_CoInitializeEx; /*****************************************************************************/ /* oslWorkerWrapperFunction */ @@ -74,7 +69,7 @@ static unsigned __stdcall oslWorkerWrapperFunction(void* pData) /* Initialize COM */ - _CoInitializeEx(NULL, COINIT_MULTITHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); /* call worker-function with data */ @@ -127,16 +122,6 @@ static oslThread oslCreateThread(oslWorkerFunction pWorker, } /*****************************************************************************/ -/* osl_ CoInitializeEx */ -/*****************************************************************************/ - -static HRESULT WINAPI osl_CoInitializeEx(LPVOID pvReserved, DWORD dwCoInit) -{ - dwCoInit = dwCoInit; /* avoid warnigns */ - return CoInitialize( pvReserved ); -} - -/*****************************************************************************/ /* osl_createThread */ /*****************************************************************************/ oslThread SAL_CALL osl_createThread(oslWorkerFunction pWorker, |