1From b7cee37734007fced7a4d5ed586c3a9e5ad92878 Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Sun, 26 Mar 2017 13:12:21 -0700 4Subject: [PATCH 10/10] Adjust header include sequence 5 6This fixes the build with musl 7 8Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> 10--- 11 extensions/ebt_among.c | 2 +- 12 extensions/ebt_arpreply.c | 2 +- 13 extensions/ebt_nat.c | 2 +- 14 useful_functions.c | 4 ++-- 15 4 files changed, 5 insertions(+), 5 deletions(-) 16 17diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c 18index 30c098c..af73bd9 100644 19--- a/extensions/ebt_among.c 20+++ b/extensions/ebt_among.c 21@@ -12,8 +12,8 @@ 22 #include <getopt.h> 23 #include <ctype.h> 24 #include <unistd.h> 25-#include "../include/ebtables_u.h" 26 #include <netinet/ether.h> 27+#include "../include/ebtables_u.h" 28 #include "../include/ethernetdb.h" 29 #include <linux/if_ether.h> 30 #include <linux/netfilter_bridge/ebt_among.h> 31diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c 32index 399868b..7b6b5ae 100644 33--- a/extensions/ebt_arpreply.c 34+++ b/extensions/ebt_arpreply.c 35@@ -11,8 +11,8 @@ 36 #include <stdlib.h> 37 #include <string.h> 38 #include <getopt.h> 39-#include "../include/ebtables_u.h" 40 #include <netinet/ether.h> 41+#include "../include/ebtables_u.h" 42 #include <linux/netfilter_bridge/ebt_arpreply.h> 43 44 static int mac_supplied; 45diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c 46index fe7e987..1899df3 100644 47--- a/extensions/ebt_nat.c 48+++ b/extensions/ebt_nat.c 49@@ -10,8 +10,8 @@ 50 #include <stdlib.h> 51 #include <string.h> 52 #include <getopt.h> 53-#include "../include/ebtables_u.h" 54 #include <netinet/ether.h> 55+#include "../include/ebtables_u.h" 56 #include <linux/netfilter_bridge/ebt_nat.h> 57 58 static int to_source_supplied, to_dest_supplied; 59diff --git a/useful_functions.c b/useful_functions.c 60index 133ae2f..c7adc66 100644 61--- a/useful_functions.c 62+++ b/useful_functions.c 63@@ -22,8 +22,6 @@ 64 * along with this program; if not, write to the Free Software 65 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 66 */ 67-#include "include/ebtables_u.h" 68-#include "include/ethernetdb.h" 69 #include <errno.h> 70 #include <inttypes.h> 71 #include <limits.h> 72@@ -36,6 +34,8 @@ 73 #include <sys/types.h> 74 #include <sys/socket.h> 75 #include <arpa/inet.h> 76+#include "include/ebtables_u.h" 77+#include "include/ethernetdb.h" 78 79 80 const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0}; 81-- 822.25.1 83 84 85