summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-09-23 16:56:26 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-09-25 14:24:08 +0200
commit8f765ed71128ecc50aa7cd464be1332658df6e10 (patch)
tree14b6c80191dbd1a7c5ac9d22d1642e4ae0c5e276 /recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
parent52496ed3e2ec94d1d93426a766ec93ab400bc1df (diff)
downloadmeta-qt5-8f765ed71128ecc50aa7cd464be1332658df6e10.tar.gz
qt5: upgrade to latest revision in 5.5 branches
* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
new file mode 100644
index 00000000..760f446c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
@@ -0,0 +1,36 @@
1From b0648c997d24855b2a6f56fc61e3159af815fb4d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 8 Jun 2015 13:59:25 -0700
4Subject: [PATCH 09/10] linux-oe-g++: Invert conditional for defining
5 QT_SOCKLEN_T
6
7This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
8only when its glibc < 2 and not also for the libraries which may define
9it as per standards but are not glibc, e.g. musl
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
17index dd12003..8623651 100644
18--- a/mkspecs/linux-oe-g++/qplatformdefs.h
19+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
20@@ -86,10 +86,10 @@
21
22 #undef QT_SOCKLEN_T
23
24-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
25-#define QT_SOCKLEN_T socklen_t
26-#else
27+#if defined(__GLIBC__) && (__GLIBC__ < 2)
28 #define QT_SOCKLEN_T int
29+#else
30+#define QT_SOCKLEN_T socklen_t
31 #endif
32
33 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
34--
352.5.3
36