diff options
author | Robert Griebl <rgriebl@trolltech.com> | 2008-07-31 22:37:56 (GMT) |
---|---|---|
committer | Robert Griebl <rgriebl@trolltech.com> | 2009-04-07 17:09:22 (GMT) |
commit | f63976b7c5fd512c00442efd5cb9afb0b3707388 (patch) | |
tree | 1704aa1deb8643d69764944d37dc05880a1a7654 /src/corelib/kernel | |
parent | 37c72476fc444d3089075473cb4e9aa42ed64694 (diff) | |
download | Qt-f63976b7c5fd512c00442efd5cb9afb0b3707388.zip Qt-f63976b7c5fd512c00442efd5cb9afb0b3707388.tar.gz Qt-f63976b7c5fd512c00442efd5cb9afb0b3707388.tar.bz2 |
The QT_NO_SHAREDMEMORY define was checked a bit too late
Reviewed-By: Harald Fernengel
Diffstat (limited to 'src/corelib/kernel')
-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 |