colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: replace <netinet/ether.h> by <net/ethernet.h>/<net/if_arp.h> in "nm-utils.c"

Browse Source 
Including <netinet/ether.h> with musl leads to a conflict with <linux/if_ether.h>,
due to redefining ethhdr struct. As we include <linux/if_ether.h> in "nm-utils.h",
that is a problem.

Avoid that, by including other headers.
This commit is contained in:
Thomas Haller
2020-12-13 17:07:40 +01:00
parent 7f4a7bf433
commit ba4142b328
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libnm-core/nm-utils.c
View File

@@ -8,8 +8,9 @@
#include "nm-utils.h" #include "nm-utils.h"
#include <stdlib.h> #include <stdlib.h>
#include <netinet/ether.h> #include <net/ethernet.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <net/if_arp.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include <libintl.h> #include <libintl.h>
#include <gmodule.h> #include <gmodule.h>