From 0bf90de93b9fe21df32319e27b2507154fa8a21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 15 Apr 2016 00:37:26 +0200 Subject: [PATCH] Fix for platform socklen_t on other C libraries than glibc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This helps to make sure that QT_SOCKLEN_T is defined to be 'int' only when its glibc < 2 and not also for the libraries which may define it as per standards but are not glibc, e.g. musl. This patch is adapted from Qt5 [1]. [1] https://github.com/qtproject/qtbase/commit/813f468a14fb84af43c1f8fc0a1430277358eba2 Signed-off-by: Jörg Krause --- mkspecs/linux-g++/qplatformdefs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h index de751dd..d4146ed 100644 --- a/mkspecs/linux-g++/qplatformdefs.h +++ b/mkspecs/linux-g++/qplatformdefs.h @@ -86,10 +86,10 @@ #undef QT_SOCKLEN_T -#if defined(__GLIBC__) && (__GLIBC__ >= 2) -#define QT_SOCKLEN_T socklen_t -#else +#if defined(__GLIBC__) && (__GLIBC__ < 2) #define QT_SOCKLEN_T int +#else +#define QT_SOCKLEN_T socklen_t #endif #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -- 2.8.0