1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNetworkInterface: Fold the test for if_nameindex into the config test

Browse Source 
No need to make workarounds for Android in the .cpp source. Just let it
fail (if it still has to fail).

Change-Id: Iaf4157b7efa2416d898cfffd14d94ebcb4d979be
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Thiago Macieira 2017-08-09 15:42:03 -07:00
parent 94c4827a9f
commit 643d19f87b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/configure.json
View File

@ -135,7 +135,8 @@
"main": [ "main": [
"char buf[IFNAMSIZ];", "char buf[IFNAMSIZ];",
"if_nametoindex(\"eth0\");", "if_nametoindex(\"eth0\");",
"if_indextoname(1, buf);" "if_indextoname(1, buf);",
"if_freenameindex(if_nameindex());"
] ]
}, },
"use": "network" "use": "network"

5
src/network/kernel/qnetworkinterface_unix.cpp
View File

@ -60,11 +60,6 @@
# define QT_NO_GETIFADDRS # define QT_NO_GETIFADDRS
#endif #endif
#ifdef Q_OS_ANDROID
// android lacks if_nameindex
# define QT_NO_IPV6IFNAME
#endif
#ifdef Q_OS_HAIKU #ifdef Q_OS_HAIKU
# include <sys/sockio.h> # include <sys/sockio.h>
# define IFF_RUNNING 0x0001 # define IFF_RUNNING 0x0001