diff options
author | Ritt Konstantin <ritt.ks@gmail.com> | 2011-04-01 08:30:59 (GMT) |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2011-04-01 08:31:19 (GMT) |
commit | e2078f5099d4db1aa2c59d2c9fa9fa8efc5a6c46 (patch) | |
tree | 93c787f628699816e05747c496a07255a89d6728 /src/gui/embedded/qwssignalhandler.cpp | |
parent | b63e0f7c612f7e63831dbee3565292ddca7dba59 (diff) | |
download | Qt-e2078f5099d4db1aa2c59d2c9fa9fa8efc5a6c46.zip Qt-e2078f5099d4db1aa2c59d2c9fa9fa8efc5a6c46.tar.gz Qt-e2078f5099d4db1aa2c59d2c9fa9fa8efc5a6c46.tar.bz2 |
move semun declaration to qcore_unix_p.h
according to X/OPEN we have to define semun ourselves but on some
systems sem.h will have it, so let's use a prefixed one (qt_semun).
this allows to avoid the code duplication and makes things a bit easier
to undesrtand
Merge-request: 2586
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/gui/embedded/qwssignalhandler.cpp')
-rw-r--r-- | src/gui/embedded/qwssignalhandler.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/gui/embedded/qwssignalhandler.cpp b/src/gui/embedded/qwssignalhandler.cpp index 49b7e94..cc18beb 100644 --- a/src/gui/embedded/qwssignalhandler.cpp +++ b/src/gui/embedded/qwssignalhandler.cpp @@ -47,21 +47,13 @@ #ifndef QT_NO_QWS_MULTIPROCESS # include <sys/ipc.h> # include <sys/sem.h> + +# include <private/qcore_unix_p.h> #endif #include <signal.h> QT_BEGIN_NAMESPACE -#ifndef Q_OS_BSD4 -union semun { - int val; - struct semid_ds *buf; - unsigned short *array; - struct seminfo *__buf; -}; -#endif - - class QWSSignalHandlerPrivate : public QWSSignalHandler { public: @@ -106,7 +98,7 @@ void QWSSignalHandler::removeSemaphore(int semno) { const int index = semaphores.lastIndexOf(semno); if (index != -1) { - semun semval; + qt_semun semval; semval.val = 0; semctl(semaphores.at(index), 0, IPC_RMID, semval); semaphores.remove(index); @@ -121,7 +113,7 @@ void QWSSignalHandler::handleSignal(int signum) signal(signum, h->oldHandlers[signum]); #ifndef QT_NO_QWS_MULTIPROCESS - semun semval; + qt_semun semval; semval.val = 0; for (int i = 0; i < h->semaphores.size(); ++i) semctl(h->semaphores.at(i), 0, IPC_RMID, semval); |