summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <francois.andriot@free.fr>2014-09-07 00:45:18 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-12-15 19:54:00 +0100
commit9ea7824ff93b9b4d689f972f7bbead75b77906ee (patch)
tree864c6ffd09ffca31330cad2bf944056ca71d2267
parentb0291308c4c07de212c55a7f3f75cc9983305d67 (diff)
downloadqt3-9ea7824ff93b9b4d689f972f7bbead75b77906ee.tar.gz
qt3-9ea7824ff93b9b4d689f972f7bbead75b77906ee.zip
Fix FTBFS because invalid data conversion in qmutex
(cherry picked from commit a28cbf4837fbb1094ff790bf53cbec2dcab94a60)
-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 7f14e6a..c392d29 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>
@@ -264,8 +265,8 @@ void QRecursiveMutexPrivate::unlock()
} else {
#ifdef QT_CHECK_RANGE
qWarning("QMutex::unlock: unlock from different thread than locker");
- qWarning(" was locked by %d, unlock attempt from %d",
- (int)owner, (int)pthread_self());
+ qWarning(" was locked by %d, unlock attempt from %lu",
+ (int)owner, (uintptr_t)pthread_self());
#endif
}