From 059a570b8a97b0e38af8c78656e638aa657310e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?=
 <pasi.petajajarvi@theqtcompany.com>
Date: Fri, 20 Feb 2015 16:36:26 +0200
Subject: 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 <ritt.ks@gmail.com>
---
 src/corelib/kernel/qsharedmemory_posix.cpp    | 1 -
 src/corelib/kernel/qsharedmemory_unix.cpp     | 2 +-
 src/corelib/kernel/qsystemsemaphore_posix.cpp | 2 --
 src/corelib/kernel/qsystemsemaphore_unix.cpp  | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/corelib/kernel')

diff --git a/src/corelib/kernel/qsharedmemory_posix.cpp b/src/corelib/kernel/qsharedmemory_posix.cpp
index 4f9b3b1429..74f98a158a 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 4f55e523e3..92184a619b 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 abe3cc7e8c..5a8e5941b7 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 cb34b8aeff..d1ec39ea40 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>
-- 
cgit v1.2.3