summaryrefslogtreecommitdiffstats
path: root/tests/auto/qthread
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2009-09-10 09:24:59 +0200
committerPaul Olav Tvete <paul.tvete@nokia.com>2009-09-10 09:27:01 +0200
commit08b54f274d57e4735d0042e295237f176506433d (patch)
tree70c5bf7929ac15342d188fee2a33604ad180ef91 /tests/auto/qthread
parent88839dfcb89869ae695c48d264851d3e9c234d9c (diff)
Compile
Reviewed-by: Jeremy Katz
Diffstat (limited to 'tests/auto/qthread')
-rw-r--r--tests/auto/qthread/tst_qthread.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/qthread/tst_qthread.cpp b/tests/auto/qthread/tst_qthread.cpp
index dec25bdf39..64bdfd046a 100644
--- a/tests/auto/qthread/tst_qthread.cpp
+++ b/tests/auto/qthread/tst_qthread.cpp
@@ -629,6 +629,12 @@ void noop(void*) { }
typedef HANDLE ThreadHandle;
#endif
+#ifdef Q_OS_WIN
+#define WIN_FIX_STDCALL __stdcall
+#else
+#define WIN_FIX_STDCALL
+#endif
+
class NativeThreadWrapper
{
public:
@@ -647,7 +653,7 @@ public:
QWaitCondition stopCondition;
protected:
static void *runUnix(void *data);
- static unsigned __stdcall runWin(void *data);
+ static unsigned WIN_FIX_STDCALL runWin(void *data);
FunctionPointer functionPointer;
void *data;
@@ -711,7 +717,7 @@ void *NativeThreadWrapper::runUnix(void *that)
return 0;
}
-unsigned __stdcall NativeThreadWrapper::runWin(void *data)
+unsigned WIN_FIX_STDCALL NativeThreadWrapper::runWin(void *data)
{
runUnix(data);
return 0;