summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <francois.andriot@free.fr>2014-09-07 00:45:21 +0200
committerSlávek Banko <slavek.banko@axis.cz>2014-09-07 00:45:21 +0200
commit6d4396b3b55acb110e6ac238bf346f581f621052 (patch)
tree71c4952d7bf4927a3e31076a71aa3f4b5b9569aa
parentd8352f9db21a44c56049d6a5b2223ff888676286 (diff)
downloadtqt3-6d4396b3b55acb110e6ac238bf346f581f621052.tar.gz
tqt3-6d4396b3b55acb110e6ac238bf346f581f621052.zip
Fix FTBFS because invalid data conversion in qmutex
-rw-r--r--src/tools/qmutex_unix.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/qmutex_unix.cpp b/src/tools/qmutex_unix.cpp
index 3fff83366..df7fd7a87 100644
--- a/src/tools/qmutex_unix.cpp
+++ b/src/tools/qmutex_unix.cpp
@@ -72,6 +72,7 @@ typedef pthread_mutex_t Q_MUTEX_T;
#include "qmutex_p.h"
#include <errno.h>
+#include <stdint.h>
#include <string.h>
// Private class declarations
@@ -270,8 +271,8 @@ void TQRecursiveMutexPrivate::unlock()
} else {
#ifdef QT_CHECK_RANGE
tqWarning("TQMutex::unlock: unlock from different thread than locker");
- tqWarning(" was locked by %d, unlock attempt from %d",
- (int)owner, (int)pthread_self());
+ tqWarning(" was locked by %d, unlock attempt from %lu",
+ (int)owner, (uintptr_t)pthread_self());
#endif
}