From 5dc606fe10029fb2eacbee2301a91863cc9b870a Mon Sep 17 00:00:00 2001 From: vasilito Date: Sat, 1 Aug 2026 14:22:28 +0300 Subject: [PATCH] qtbase: drop __redox__ struct ifreq fallback; bump relibc pointer relibc now provides a complete struct ifreq (+ ifr_* accessor macros and SIOCGIF* ioctls) in , so qnetworkinterface_unix.cpp's __redox__ fallback definition became a redefinition of the system type. Remove it; the network module now uses the real relibc struct ifreq. --- .../network/kernel/qnetworkinterface_unix.cpp | 33 +++---------------- local/sources/relibc | 2 +- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/local/recipes/qt/qtbase/source/src/network/kernel/qnetworkinterface_unix.cpp b/local/recipes/qt/qtbase/source/src/network/kernel/qnetworkinterface_unix.cpp index 048983576b..4221ef725c 100644 --- a/local/recipes/qt/qtbase/source/src/network/kernel/qnetworkinterface_unix.cpp +++ b/local/recipes/qt/qtbase/source/src/network/kernel/qnetworkinterface_unix.cpp @@ -31,35 +31,10 @@ #include -#if defined(__redox__) -// Redox relibc's declares the interface flags and if_nameindex() -// helpers but not struct ifreq (there is no SIOCGIF* ioctl support on Redox). -// The getifaddrs path below still declares a `struct ifreq` to pass to -// getMtu(); the SIOCGIFMTU body is #ifdef-guarded and compiles out, so this -// only needs to be a complete type. Provide a minimal-but-standard layout so -// the network module builds; the ioctls that would use it fail gracefully at -// runtime (mtu stays 0). -# ifndef IFNAMSIZ -# define IFNAMSIZ 16 -# endif -struct ifreq { - char ifr_name[IFNAMSIZ]; - union { - struct sockaddr ifr_addr; - struct sockaddr ifr_dstaddr; - struct sockaddr ifr_broadaddr; - struct sockaddr ifr_netmask; - struct sockaddr ifr_hwaddr; - short ifr_flags; - int ifr_ifindex; - int ifr_metric; - int ifr_mtu; - char ifr_slave[IFNAMSIZ]; - char ifr_newname[IFNAMSIZ]; - char *ifr_data; - }; -}; -#endif // __redox__ +// Redox's relibc now provides a complete struct ifreq (with the ifr_* union +// accessor macros and the SIOCGIF* ioctls) in , so the previous +// __redox__ fallback definition here is no longer needed and would be a +// redefinition of the system type. QT_BEGIN_NAMESPACE diff --git a/local/sources/relibc b/local/sources/relibc index 8535f7b843..5b0363e8c0 160000 --- a/local/sources/relibc +++ b/local/sources/relibc @@ -1 +1 @@ -Subproject commit 8535f7b8433ca6f88f4c404a20c86a3e09275275 +Subproject commit 5b0363e8c067508c4896be7997c63e5f0c25bad2