diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-16 08:24:47 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-16 08:24:47 (GMT) |
| commit | ee1e6222114028c2ff181f972e32f15011723b5f (patch) | |
| tree | cac3620d648f1a7c6668c7bb3795cb0f4295baf9 /src/corelib/kernel/qsharedmemory_unix.cpp | |
| parent | cbec6d9481bf8f55834eafac4eca53f85206b240 (diff) | |
| parent | d43d33eb3121519d0025ad433d5c186365c47ef6 (diff) | |
| download | Qt-ee1e6222114028c2ff181f972e32f15011723b5f.zip Qt-ee1e6222114028c2ff181f972e32f15011723b5f.tar.gz Qt-ee1e6222114028c2ff181f972e32f15011723b5f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/corelib/kernel/qsharedmemory_unix.cpp')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_unix.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index 487c653..cd248dc 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -47,12 +47,9 @@ #include <qdir.h> #include <qdebug.h> -#include <errno.h> - -QT_BEGIN_NAMESPACE - #ifndef QT_NO_SHAREDMEMORY +#include <errno.h> #include <sys/types.h> #include <sys/ipc.h> #include <sys/shm.h> @@ -61,6 +58,8 @@ QT_BEGIN_NAMESPACE #include <fcntl.h> #include <unistd.h> +QT_BEGIN_NAMESPACE + QSharedMemoryPrivate::QSharedMemoryPrivate() : QObjectPrivate(), memory(0), size(0), error(QSharedMemory::NoError), #ifndef QT_NO_SYSTEMSEMAPHORE |