AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network: Fix IFF_UP conflict on Linux with unity builds

Browse Source 
I cannot repro this myself, but from the bug report it seems to be
defined in two headers, so we should consistently use the same one.

Fixes: QTBUG-113787
Pick-to: 6.5
Change-Id: I9f1cc51e379c33dbbf659946340a5207aaeb448a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2023-05-26 12:14:04 +02:00
parent f3d0f4f4c3
commit 456cfa0bd2
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/socket/qnativesocketengine_unix.cpp
View File

@ -18,7 +18,11 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#ifndef QT_NO_IPV6IFNAME #ifndef QT_NO_IPV6IFNAME
#ifdef Q_OS_LINUX
#include <linux/if.h>
#else // Q_OS_LINUX
#include <net/if.h> #include <net/if.h>
#endif // !Q_OS_LINUX
#endif #endif
#ifdef QT_LINUXBASE #ifdef QT_LINUXBASE
#include <arpa/inet.h> #include <arpa/inet.h>