Skip to content

(musl-libc) 2 Backports: fix building with musl libc / Remove checks for glibc < 2 from qplatformdefs.h files

Andreas Sturmlechner requested to merge asturmlechner/qtbase:musl-libc into kde/5.15

[PATCH 1/2] linux-clang/qplatformdefs: fix building with musl libc

This is basically a duplicate of the commit which fixed building with
musl, but on linux-g++, 813f468a14fb84af43c1f8fc0a1430277358eba2.

Change-Id: I399005ac6947ba3f2b4ed5087472cd9d54a0850d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit a421e40984a61b7051d045832af07988d692f67d)

[PATCH 2/2] Remove checks for glibc < 2 from qplatformdefs.h files

The last release of glibc 1 was 1995 and can be considered outdated.

Also, the current check prevented building with e.g. musl libc.

Every file that includes common/posix/qplatformdefs.h already has
QT_SOCKLEN_T defined to socklen_t, so remove the definition from those
completely.

This is a continuation of 813f468a and a421e409.

Change-Id: Icf2692a8e814286487662e290a8f844872eefe53
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 1c7950081f926475bbdaa18379c2f51f99fcb3bb)

Merge request reports