summaryrefslogtreecommitdiffstats
path: root/src/openvpn/syshead.h
diff options
context:
space:
mode:
authorFelix Janda <felix.janda@posteo.de>2015-05-16 15:59:50 +0200
committerGert Doering <gert@greenie.muc.de>2015-05-16 20:40:53 +0200
commitddb1f20a9ddbb94956c9f7b1115c89543d9b411a (patch)
tree98fd01ca862d347bc8d3205fb89508cfcc01c7af /src/openvpn/syshead.h
parent2d321609674a916c8cd7bbf0090e0342e90cca36 (diff)
downloadopenvpn-ddb1f20a9ddbb94956c9f7b1115c89543d9b411a.tar.gz
openvpn-ddb1f20a9ddbb94956c9f7b1115c89543d9b411a.tar.xz
openvpn-ddb1f20a9ddbb94956c9f7b1115c89543d9b411a.zip
Use OPENVPN_ETH_P_* so that <netinet/if_ether.h> is unecessary
Fixes compilation error on linux with musl libc because of conflicting ethhdr declarations in <netinet/if_ether.h> and <linux/if_ether.h> which is included from <linux/if_tun.h> Signed-off-by: Felix Janda <felix.janda@posteo.de> Acked-by: Steffan Karger <steffan.karger@fox-it.com> Message-Id: <20150516134604.GA2302@euler> URL: http://article.gmane.org/gmane.network.openvpn.devel/9690 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/syshead.h')
-rw-r--r--src/openvpn/syshead.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index b898bf2..cf29131 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -214,10 +214,6 @@
#if defined(TARGET_LINUX) || defined (TARGET_ANDROID)
-#if defined(HAVE_NETINET_IF_ETHER_H)
-#include <netinet/if_ether.h>
-#endif
-
#ifdef HAVE_LINUX_IF_TUN_H
#include <linux/if_tun.h>
#endif