DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

NetBSD: Fix compile

Browse source 
On NetBSD the ethernet header is net/if_ether.h

This also pulls in net/if.h which defines if_type, which in turn
conflicts with an enum in wpa_supplicant. As such we need to
include this at the bottom rather than at the top.

Signed-off-by: Roy Marples <roy@marples.name>
This commit is contained in:
Roy Marples 2019-09-19 10:59:09 +01:00 committed by Jouni Malinen
parent d0d303ae91
commit 7846e8d608
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wpa_supplicant/ctrl_iface.c
View file

@ -11,9 +11,6 @@
#include <netinet/ip.h> #include <netinet/ip.h>
#endif /* CONFIG_TESTING_OPTIONS */ #endif /* CONFIG_TESTING_OPTIONS */
#if !defined(__CYGWIN__) && !defined(CONFIG_NATIVE_WINDOWS)
#include <net/ethernet.h>
#endif
#include "utils/common.h" #include "utils/common.h"
#include "utils/eloop.h" #include "utils/eloop.h"
#include "utils/uuid.h" #include "utils/uuid.h"
@ -60,6 +57,12 @@
#include "dpp_supplicant.h" #include "dpp_supplicant.h"
#include "sme.h" #include "sme.h"
#ifdef __NetBSD__
#include <net/if_ether.h>
#elif !defined(__CYGWIN__) && !defined(CONFIG_NATIVE_WINDOWS)
#include <net/ethernet.h>
#endif
static int wpa_supplicant_global_iface_list(struct wpa_global *global, static int wpa_supplicant_global_iface_list(struct wpa_global *global,
char *buf, int len); char *buf, int len);
static int wpa_supplicant_global_iface_interfaces(struct wpa_global *global, static int wpa_supplicant_global_iface_interfaces(struct wpa_global *global,