Fix commit afc4508 Fix namespace collision with musl if_ether.h

Commit afc4508 used the wrong definitions for checking the if_ether.h namespace collision. This commit uses the correct definitions. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
acassen · Apr 23, 2018 · 58ae2ba · 58ae2ba
1 parent b02b643
commit 58ae2ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/keepalived/include/vrrp_arp.h b/keepalived/include/vrrp_arp.h
@@ -25,7 +25,7 @@
 
 /* system includes */
 #include <netinet/in.h>
-#ifdef _HAVE_NET_LINUX_IF_H_COLLISION_
+#ifdef _HAVE_NETINET_LINUX_IF_ETHER_H_COLLISION_
 #define _NETINET_IF_ETHER_H
 #include <linux/if_ether.h>
 #endif

diff --git a/keepalived/include/vrrp_vmac.h b/keepalived/include/vrrp_vmac.h
@@ -29,7 +29,7 @@
 #include <arpa/inet.h>
 #include <string.h>
 #include <syslog.h>
-#ifdef _HAVE_NET_LINUX_IF_H_COLLISION_
+#ifdef _HAVE_NETINET_LINUX_IF_ETHER_H_COLLISION_
 #define _NETINET_IF_ETHER_H
 #include <linux/if_ether.h>
 #endif