diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-05-04 12:21:33 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-05-04 12:21:33 (GMT) |
| commit | 4ac548735b1a62b2db344b5ee4ecc14207f1111d (patch) | |
| tree | 05755818cbbb5ae29a65f374e2c49c2ca5ba4924 | |
| parent | 4a079000243ed05ce37d3c7055b5bd56c7ccf85d (diff) | |
| parent | f68f352dec04d796916dd8c4f5f60e8f62e4edf6 (diff) | |
| download | Qt-4ac548735b1a62b2db344b5ee4ecc14207f1111d.zip Qt-4ac548735b1a62b2db344b5ee4ecc14207f1111d.tar.gz Qt-4ac548735b1a62b2db344b5ee4ecc14207f1111d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
| -rw-r--r-- | src/corelib/kernel/qfunctions_wince.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/kernel/qfunctions_wince.h | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/corelib/kernel/qfunctions_wince.cpp b/src/corelib/kernel/qfunctions_wince.cpp index 1c929c7..e0f7687 100644 --- a/src/corelib/kernel/qfunctions_wince.cpp +++ b/src/corelib/kernel/qfunctions_wince.cpp @@ -285,11 +285,6 @@ int qt_wince_SetErrorMode(int newValue) return result; } -HRESULT qt_wince_CoInitialize(void* reserved) -{ - return CoInitializeEx(reserved, 0); -} - bool qt_wince__chmod(const char *file, int mode) { return _wchmod( reinterpret_cast<const wchar_t *> (QString::fromLatin1(file).utf16()), mode); diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h index 123bd23..5f08bb3 100644 --- a/src/corelib/kernel/qfunctions_wince.h +++ b/src/corelib/kernel/qfunctions_wince.h @@ -199,7 +199,9 @@ int qt_wince__fstat( int handle, struct stat *buffer); #define SEM_FAILCRITICALERRORS 0x0001 #define SEM_NOOPENFILEERRORBOX 0x0002 int qt_wince_SetErrorMode(int); -HRESULT qt_wince_CoInitialize(void* reserved); +#ifndef CoInitialize +#define CoInitialize(x) CoInitializeEx(x, COINIT_MULTITHREADED) +#endif bool qt_wince__chmod(const char *file, int mode); bool qt_wince__wchmod(const WCHAR *file, int mode); @@ -376,7 +378,6 @@ typedef DWORD OLE_COLOR; #define _rename(a,b) qt_wince__rename(a,b) #define _remove(a) qt_wince__remove(a) #define SetErrorMode(a) qt_wince_SetErrorMode(a) -#define CoInitialize(a) qt_wince_CoInitialize(a) #define _chmod(a,b) qt_wince__chmod(a,b) #define _wchmod(a,b) qt_wince__wchmod(a,b) #define CreateFileA(a,b,c,d,e,f,g) qt_wince_CreateFileA(a,b,c,d,e,f,g) |