diff options
| author | Tristan Chabredier <tc@4js.com> | 2009-12-15 09:20:29 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-15 09:20:29 (GMT) |
| commit | 7a3c595421b98087da638a5e706320d0d936d828 (patch) | |
| tree | fa0413340a98487e70eb5e6a62148318498a34dd | |
| parent | cd0c4934ed60a3eae12d85d93aa950e9296cdb83 (diff) | |
| download | Qt-7a3c595421b98087da638a5e706320d0d936d828.zip Qt-7a3c595421b98087da638a5e706320d0d936d828.tar.gz Qt-7a3c595421b98087da638a5e706320d0d936d828.tar.bz2 | |
Fix compilation on HP-UX 11.11.
Error was:
thread/qthread_unix.cpp: In static member function 'static int QThread::idealThreadCount()':
thread/qthread_unix.cpp:325: error: aggregate 'pst_dynamic psd' has incomplete type and cannot be defined
thread/qthread_unix.cpp:326: error: 'pstat_getdynamic' was not declared in this scope
Task-number: QTBUG-6576
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| -rw-r--r-- | mkspecs/hpux-g++-64/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/hpux-g++-64/qplatformdefs.h | 2 | ||||
| -rw-r--r-- | src/corelib/thread/qthread_unix.cpp | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf index 38595c9..f76bd4e 100644 --- a/mkspecs/hpux-g++-64/qmake.conf +++ b/mkspecs/hpux-g++-64/qmake.conf @@ -15,7 +15,7 @@ QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +DA2.0W +QMAKE_CFLAGS = QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = -w @@ -51,7 +51,7 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ QMAKE_LINK_C = gcc QMAKE_LINK_C_SHLIB = gcc -QMAKE_LFLAGS = +DA2.0W -Wl,+s -lpthread +QMAKE_LFLAGS = -Wl,+s -lpthread QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -fPIC -shared diff --git a/mkspecs/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h index a8d06d8..ac13799 100644 --- a/mkspecs/hpux-g++-64/qplatformdefs.h +++ b/mkspecs/hpux-g++-64/qplatformdefs.h @@ -145,7 +145,7 @@ #define QT_SIGNAL_ARGS int #define QT_SIGNAL_IGNORE SIG_IGN -#define QT_SOCKLEN_T int +#define QT_SOCKLEN_T socklen_t #endif // QPLATFORMDEFS_H diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 21b5e65..0309c67 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -74,6 +74,10 @@ # endif #endif +#ifdef Q_OS_HPUX +#include <sys/pstat.h> +#endif + #if defined(Q_OS_MAC) # ifdef qDebug # define old_qDebug qDebug |