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