diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-11-04 05:34:26 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-11-04 05:34:26 (GMT) |
| commit | 0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c (patch) | |
| tree | e0112b3ddefa71824e45d55f44517904e3c9680c /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | a59291393cc70a1f922e4796efbb72b29920da27 (diff) | |
| parent | ec502c9e9a26f984023e4f08126e033a504970b2 (diff) | |
| download | Qt-0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c.zip Qt-0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c.tar.gz Qt-0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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() |