diff options
| author | Pasi Petäjäjärvi <[email protected]> | 2015-02-20 16:36:26 +0200 |
|---|---|---|
| committer | Pasi Petäjäjärvi <[email protected]> | 2015-02-25 11:42:36 +0000 |
| commit | 059a570b8a97b0e38af8c78656e638aa657310e8 (patch) | |
| tree | ccc7f07da140598eda9c49e39e1405eb80df5886 | |
| parent | 3f84c18ac0f4109906be4a80c3a1480b032e2e17 (diff) | |
Fix QT_POSIX_IPC support
On platforms which does not have at all sysv support, all
posix ipc tests and compilation failed because sysv
specific header files were included unconditionally.
Change-Id: I5713ace6daeb6e79f8794ce42b2b3dfa1b95ab2d
Reviewed-by: Konstantin Ritt <[email protected]>
| -rw-r--r-- | config.tests/unix/ipc_posix/ipc.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_posix.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_unix.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qsystemsemaphore_posix.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qsystemsemaphore_unix.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp | 2 |
6 files changed, 3 insertions, 7 deletions
diff --git a/config.tests/unix/ipc_posix/ipc.cpp b/config.tests/unix/ipc_posix/ipc.cpp index e2d2d1dc736..2d9d9bbc3c1 100644 --- a/config.tests/unix/ipc_posix/ipc.cpp +++ b/config.tests/unix/ipc_posix/ipc.cpp @@ -32,7 +32,6 @@ ****************************************************************************/ #include <sys/types.h> -#include <sys/ipc.h> #include <sys/mman.h> #include <semaphore.h> #include <fcntl.h> diff --git a/src/corelib/kernel/qsharedmemory_posix.cpp b/src/corelib/kernel/qsharedmemory_posix.cpp index 4f9b3b14292..74f98a158ab 100644 --- a/src/corelib/kernel/qsharedmemory_posix.cpp +++ b/src/corelib/kernel/qsharedmemory_posix.cpp @@ -46,7 +46,6 @@ #ifndef QT_NO_SHAREDMEMORY #include <sys/types.h> -#include <sys/ipc.h> #include <sys/mman.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index 4f55e523e38..92184a619b2 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -42,8 +42,8 @@ #ifndef QT_NO_SHAREDMEMORY #include <sys/types.h> -#include <sys/ipc.h> #ifndef QT_POSIX_IPC +#include <sys/ipc.h> #include <sys/shm.h> #else #include <sys/mman.h> diff --git a/src/corelib/kernel/qsystemsemaphore_posix.cpp b/src/corelib/kernel/qsystemsemaphore_posix.cpp index abe3cc7e8c1..5a8e5941b78 100644 --- a/src/corelib/kernel/qsystemsemaphore_posix.cpp +++ b/src/corelib/kernel/qsystemsemaphore_posix.cpp @@ -45,8 +45,6 @@ #ifndef QT_NO_SYSTEMSEMAPHORE #include <sys/types.h> -#include <sys/ipc.h> -#include <sys/sem.h> #include <fcntl.h> #include <errno.h> diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp index cb34b8aeff0..d1ec39ea40a 100644 --- a/src/corelib/kernel/qsystemsemaphore_unix.cpp +++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp @@ -40,8 +40,8 @@ #ifndef QT_NO_SYSTEMSEMAPHORE #include <sys/types.h> -#include <sys/ipc.h> #ifndef QT_POSIX_IPC +#include <sys/ipc.h> #include <sys/sem.h> #endif #include <fcntl.h> diff --git a/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp b/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp index af932202fe6..5a92c2f0cb5 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp +++ b/tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp @@ -173,8 +173,8 @@ void tst_QSharedMemory::cleanup() #ifndef Q_OS_WIN #include <private/qsharedmemory_p.h> #include <sys/types.h> -#include <sys/ipc.h> #ifndef QT_POSIX_IPC +#include <sys/ipc.h> #include <sys/shm.h> #else #include <sys/mman.h> |