diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-11-03 13:42:29 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-11-03 13:42:29 (GMT) |
| commit | 63f2cc8d9526d3fd8a64e62be2a469bf0eee54f0 (patch) | |
| tree | 7e6724964ceb6e38f478074780f06df0bdd11dbd /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | 6a89291da7e1322ad81c4939cc9d69db01957a4c (diff) | |
| parent | dc89c842779f87ce69882ba54fa8d5bb79e0edbd (diff) | |
| download | Qt-63f2cc8d9526d3fd8a64e62be2a469bf0eee54f0.zip Qt-63f2cc8d9526d3fd8a64e62be2a469bf0eee54f0.tar.gz Qt-63f2cc8d9526d3fd8a64e62be2a469bf0eee54f0.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Diffstat (limited to 'src/corelib/kernel/qsharedmemory_unix.cpp')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_unix.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index 1165fb1..40b9f04 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -49,8 +49,6 @@ #include <errno.h> -#ifndef QT_NO_SHAREDMEMORY - #include <sys/types.h> #include <sys/ipc.h> #include <sys/shm.h> @@ -61,6 +59,7 @@ #include "private/qcore_unix_p.h" +#ifndef QT_NO_SHAREDMEMORY QT_BEGIN_NAMESPACE QSharedMemoryPrivate::QSharedMemoryPrivate() |