diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-11-05 04:17:49 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-11-05 04:17:49 (GMT) |
| commit | c4bc9a635bf0fd42e80e570909e204ae24b303b2 (patch) | |
| tree | f31b37dc4aec0de9aba28b7f0a734336fd0812dc /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | 3babe49011d363aaaabafb70bfb0626217ec8959 (diff) | |
| parent | d39ec85b7e5d8702c2888cdad4ccdae72531c199 (diff) | |
| download | Qt-c4bc9a635bf0fd42e80e570909e204ae24b303b2.zip Qt-c4bc9a635bf0fd42e80e570909e204ae24b303b2.tar.gz Qt-c4bc9a635bf0fd42e80e570909e204ae24b303b2.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() |