diff options
Diffstat (limited to 'src/corelib/kernel/qfunctions_wince.h')
| -rw-r--r-- | src/corelib/kernel/qfunctions_wince.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h index 4273070c11..347f57f95d 100644 --- a/src/corelib/kernel/qfunctions_wince.h +++ b/src/corelib/kernel/qfunctions_wince.h @@ -76,8 +76,8 @@ QT_END_NAMESPACE #endif // Environment ------------------------------------------------------ -errno_t qt_wince_getenv_s(size_t*, char*, size_t, const char*); -errno_t qt_wince__putenv_s(const char*, const char*); +errno_t qt_fake_getenv_s(size_t*, char*, size_t, const char*); +errno_t qt_fake__putenv_s(const char*, const char*); #ifdef __cplusplus // have this as tiff plugin is written in C extern "C" { @@ -398,20 +398,20 @@ typedef DWORD OLE_COLOR; { \ return qt_wince_##funcname(p1); \ } -#define generate_inline_return_func2(funcname, returntype, param1, param2) \ +#define generate_inline_return_func2(funcname, returntype, prependnamespace, param1, param2) \ inline returntype funcname(param1 p1, param2 p2) \ { \ - return qt_wince_##funcname(p1, p2); \ + return prependnamespace##funcname(p1, p2); \ } #define generate_inline_return_func3(funcname, returntype, param1, param2, param3) \ inline returntype funcname(param1 p1, param2 p2, param3 p3) \ { \ return qt_wince_##funcname(p1, p2, p3); \ } -#define generate_inline_return_func4(funcname, returntype, param1, param2, param3, param4) \ +#define generate_inline_return_func4(funcname, returntype, prependnamespace, param1, param2, param3, param4) \ inline returntype funcname(param1 p1, param2 p2, param3 p3, param4 p4) \ { \ - return qt_wince_##funcname(p1, p2, p3, p4); \ + return prependnamespace##funcname(p1, p2, p3, p4); \ } #define generate_inline_return_func5(funcname, returntype, param1, param2, param3, param4, param5) \ inline returntype funcname(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) \ @@ -433,28 +433,28 @@ typedef unsigned (__stdcall *StartAdressExFunc)(void *); typedef void(*StartAdressFunc)(void *); typedef int ( __cdecl *CompareFunc ) (const void *, const void *) ; -generate_inline_return_func4(getenv_s, errno_t, size_t *, char *, size_t, const char *) -generate_inline_return_func2(_putenv_s, errno_t, const char *, const char *) +generate_inline_return_func4(getenv_s, errno_t, qt_fake_, size_t *, char *, size_t, const char *) +generate_inline_return_func2(_putenv_s, errno_t, qt_fake_, const char *, const char *) generate_inline_return_func0(_getpid, int) generate_inline_return_func1(time_tToFt, FILETIME, time_t) generate_inline_return_func1(ftToTime_t, time_t, FILETIME) generate_inline_return_func0(_getdrive, int) -generate_inline_return_func2(_waccess, int, const wchar_t *, int) +generate_inline_return_func2(_waccess, int, qt_wince_, const wchar_t *, int) generate_inline_return_func3(_wopen, int, const wchar_t *, int, int) -generate_inline_return_func2(_fdopen, FILE *, int, const char *) -generate_inline_return_func2(fdopen, FILE *, int, const char *) +generate_inline_return_func2(_fdopen, FILE *, qt_wince_, int, const char *) +generate_inline_return_func2(fdopen, FILE *, qt_wince_, int, const char *) generate_inline_return_func1(rewind, void, FILE *) generate_inline_return_func0(tmpfile, FILE *) -generate_inline_return_func2(_rename, int, const char *, const char *) +generate_inline_return_func2(_rename, int, qt_wince_, const char *, const char *) generate_inline_return_func1(_remove, int, const char *) generate_inline_return_func1(SetErrorMode, int, int) #if _WIN32_WCE < 0x800 -generate_inline_return_func2(_chmod, bool, const char *, int) -generate_inline_return_func2(_wchmod, bool, const wchar_t *, int) +generate_inline_return_func2(_chmod, bool, qt_wince_, const char *, int) +generate_inline_return_func2(_wchmod, bool, qt_wince_, const wchar_t *, int) #endif generate_inline_return_func7(CreateFileA, HANDLE, LPCSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE) -generate_inline_return_func4(SetWindowOrgEx, BOOL, HDC, int, int, LPPOINT) -generate_inline_return_func2(calloc, void *, size_t, size_t) +generate_inline_return_func4(SetWindowOrgEx, BOOL, qt_wince_, HDC, int, int, LPPOINT) +generate_inline_return_func2(calloc, void *, qt_wince_, size_t, size_t) generate_inline_return_func0(GetThreadLocale, DWORD) generate_inline_return_func3(_beginthread, HANDLE, StartAdressFunc, unsigned, void *) generate_inline_return_func6(_beginthreadex, unsigned long, void *, unsigned, StartAdressExFunc, void *, unsigned, unsigned *) |