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>
This commit is contained in:
parent
3f84c18ac0
commit
059a570b8a
@ -32,7 +32,6 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/ipc.h>
|
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <semaphore.h>
|
#include <semaphore.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
@ -46,7 +46,6 @@
|
|||||||
|
|
||||||
#ifndef QT_NO_SHAREDMEMORY
|
#ifndef QT_NO_SHAREDMEMORY
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/ipc.h>
|
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
@ -42,8 +42,8 @@
|
|||||||
|
|
||||||
#ifndef QT_NO_SHAREDMEMORY
|
#ifndef QT_NO_SHAREDMEMORY
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/ipc.h>
|
|
||||||
#ifndef QT_POSIX_IPC
|
#ifndef QT_POSIX_IPC
|
||||||
|
#include <sys/ipc.h>
|
||||||
#include <sys/shm.h>
|
#include <sys/shm.h>
|
||||||
#else
|
#else
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
@ -45,8 +45,6 @@
|
|||||||
#ifndef QT_NO_SYSTEMSEMAPHORE
|
#ifndef QT_NO_SYSTEMSEMAPHORE
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/ipc.h>
|
|
||||||
#include <sys/sem.h>
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
|
@ -40,8 +40,8 @@
|
|||||||
#ifndef QT_NO_SYSTEMSEMAPHORE
|
#ifndef QT_NO_SYSTEMSEMAPHORE
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/ipc.h>
|
|
||||||
#ifndef QT_POSIX_IPC
|
#ifndef QT_POSIX_IPC
|
||||||
|
#include <sys/ipc.h>
|
||||||
#include <sys/sem.h>
|
#include <sys/sem.h>
|
||||||
#endif
|
#endif
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
@ -173,8 +173,8 @@ void tst_QSharedMemory::cleanup()
|
|||||||
#ifndef Q_OS_WIN
|
#ifndef Q_OS_WIN
|
||||||
#include <private/qsharedmemory_p.h>
|
#include <private/qsharedmemory_p.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/ipc.h>
|
|
||||||
#ifndef QT_POSIX_IPC
|
#ifndef QT_POSIX_IPC
|
||||||
|
#include <sys/ipc.h>
|
||||||
#include <sys/shm.h>
|
#include <sys/shm.h>
|
||||||
#else
|
#else
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user