platform: include "linux-headers" via "libnm-std-aux/nm-linux-compat.h"
We have our own copy of linux kernel headers, and we must never directly include the corresponding versions from the system. Avoid that, by only including the clones via "libnm-std-aux/nm-linux-compat.h" and by including the compat wrapper header before other system headers.
This commit is contained in:
@@ -7,6 +7,8 @@
|
||||
|
||||
#include "nm-linux-platform.h"
|
||||
|
||||
#include "libnm-std-aux/nm-linux-compat.h"
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <dlfcn.h>
|
||||
#include <endian.h>
|
||||
@@ -23,7 +25,6 @@
|
||||
#include <linux/if_vlan.h>
|
||||
#include <linux/ip6_tunnel.h>
|
||||
#include <linux/tc_act/tc_mirred.h>
|
||||
#include <linux-headers/mptcp.h>
|
||||
#include <netinet/icmp6.h>
|
||||
#include <netinet/in.h>
|
||||
#include <net/if_arp.h>
|
||||
|
@@ -9,14 +9,14 @@
|
||||
|
||||
#include "nm-wifi-utils-nl80211.h"
|
||||
|
||||
#include "libnm-std-aux/nm-linux-compat.h"
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
#include <net/ethernet.h>
|
||||
#include <unistd.h>
|
||||
#include <linux/nl80211.h>
|
||||
#include <linux/if.h>
|
||||
|
||||
#include "linux-headers/nl80211-vnd-intel.h"
|
||||
|
||||
#include "libnm-log-core/nm-logging.h"
|
||||
#include "libnm-platform/nm-netlink.h"
|
||||
#include "nm-wifi-utils-private.h"
|
||||
|
@@ -21,5 +21,7 @@
|
||||
|
||||
#include "linux-headers/ethtool.h"
|
||||
#include "linux-headers/nl802154.h"
|
||||
#include "linux-headers/nl80211-vnd-intel.h"
|
||||
#include "linux-headers/mptcp.h"
|
||||
|
||||
#endif /* __NM_LINUX_COMPAT_H__ */
|
||||
|
Reference in New Issue
Block a user