qtbase: drop __redox__ struct ifreq fallback; bump relibc pointer
relibc now provides a complete struct ifreq (+ ifr_* accessor macros and SIOCGIF* ioctls) in <net/if.h>, 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.
This commit is contained in:
@@ -31,35 +31,10 @@
|
||||
|
||||
#include <qplatformdefs.h>
|
||||
|
||||
#if defined(__redox__)
|
||||
// Redox relibc's <net/if.h> 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 <net/if.h>, so the previous
|
||||
// __redox__ fallback definition here is no longer needed and would be a
|
||||
// redefinition of the system type.
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
+1
-1
Submodule local/sources/relibc updated: 8535f7b843...5b0363e8c0
Reference in New Issue
Block a user