summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2011-02-25 08:43:04 (GMT)
committerMorten Sorvig <msorvig@trolltech.com>2011-03-16 09:36:24 (GMT)
commit294ce2967d3e205c920965464642847ce014ab67 (patch)
treee914d4842d4289acb3163868d234ef1d7d6ff191 /mkspecs
parenta2ba87d1edfe1008f96a99f24c2c52c521e404e6 (diff)
downloadQt-294ce2967d3e205c920965464642847ce014ab67.zip
Qt-294ce2967d3e205c920965464642847ce014ab67.tar.gz
Qt-294ce2967d3e205c920965464642847ce014ab67.tar.bz2
posix platformdefs: Add QT_NO_SOCKET_H.
Prevents including <sys/socket.h> Reviewed-by: Jørgen Lind
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/posix/qplatformdefs.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/common/posix/qplatformdefs.h b/mkspecs/common/posix/qplatformdefs.h
index 103ce89..60bc041 100644
--- a/mkspecs/common/posix/qplatformdefs.h
+++ b/mkspecs/common/posix/qplatformdefs.h
@@ -45,7 +45,9 @@
#include <signal.h>
#include <sys/types.h>
-#include <sys/socket.h>
+#ifndef QT_NO_SOCKET_H
+# include <sys/socket.h>
+#endif
#include <sys/stat.h>
#if defined(QT_USE_XOPEN_LFS_EXTENSIONS) && defined(QT_LARGEFILE_SUPPORT)