diff options
| author | kh <qtc-committer@nokia.com> | 2009-07-29 16:32:57 (GMT) |
|---|---|---|
| committer | kh <qtc-committer@nokia.com> | 2009-07-29 16:32:57 (GMT) |
| commit | 91005e4878c76630390fd17afec2f283fcd5121d (patch) | |
| tree | c9a997a7c542da025ff00549ea80bd517557c577 /src/corelib/thread/qmutex_unix.cpp | |
| parent | f21a36efaab400e086a8c1e87f91da595e4a4443 (diff) | |
| parent | b2b626a936d778b89f8fbf33ac914d99876ec4b3 (diff) | |
| download | Qt-91005e4878c76630390fd17afec2f283fcd5121d.zip Qt-91005e4878c76630390fd17afec2f283fcd5121d.tar.gz Qt-91005e4878c76630390fd17afec2f283fcd5121d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/thread/qmutex_unix.cpp')
| -rw-r--r-- | src/corelib/thread/qmutex_unix.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/thread/qmutex_unix.cpp b/src/corelib/thread/qmutex_unix.cpp index 43ba668..02c7c6f 100644 --- a/src/corelib/thread/qmutex_unix.cpp +++ b/src/corelib/thread/qmutex_unix.cpp @@ -49,6 +49,10 @@ #include <errno.h> +#if defined(Q_OS_VXWORKS) && defined(wakeup) +#undef wakeup +#endif + QT_BEGIN_NAMESPACE static void report_error(int code, const char *where, const char *what) |