diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-06 09:59:09 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-06 09:59:09 (GMT) |
| commit | 09ed1ed777dc21902d53da932125aee8dd952781 (patch) | |
| tree | 69581f122b06e2b12458862487e5e6f07dca1a1c /src | |
| parent | 3255adb7cae11cdedc327389970f9ac5b47c6a6b (diff) | |
| download | Qt-09ed1ed777dc21902d53da932125aee8dd952781.zip Qt-09ed1ed777dc21902d53da932125aee8dd952781.tar.gz Qt-09ed1ed777dc21902d53da932125aee8dd952781.tar.bz2 | |
fixed borked up merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory_unix.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index 61f7727..05369c4 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -48,6 +48,9 @@ #include <qdebug.h> #include <errno.h> + +#ifndef QT_NO_SHAREDMEMORY + #include <sys/types.h> #include <sys/ipc.h> #include <sys/shm.h> |