fixed borked up merge

PaPaNebo · Aug 6, 2009 · 09ed1ed · 09ed1ed
1 parent 3255adb
commit 09ed1ed
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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>