| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 9b7a32903b56ce4d41f264a345ca59a0b00d53b3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 2 Feb 2018 23:28:33 -0800 |
| 4 | Subject: [PATCH 3/4] bnx2x.c: Reorder the includes to avoid duplicate defines |
| 5 | with musl |
| 6 | |
| 7 | including nic.h before linux/ethtool.h avoids redefinitions of |
| 8 | eth structs |
| 9 | |
| 10 | /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0.876-r0/recipe-sysroot/ |
| 11 | usr/include/netinet/if_ether.h:104:8: error: redefinition of 'struct ethhdr' |
| 12 | struct ethhdr { |
| 13 | ^~~~~~ |
| 14 | In file included from /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0. |
| 15 | 876-r0/recipe-sysroot/usr/include/linux/ethtool.h:19:0, |
| 16 | from qedi.c:52: |
| 17 | /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0.876-r0/recipe-sysroot/ |
| 18 | usr/include/linux/if_ether.h:154:8: note: originally defined here |
| 19 | struct ethhdr { |
| 20 | ^~~~~~ |
| 21 | |
| 22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 23 | --- |
| 24 | iscsiuio/src/unix/libs/bnx2x.c | 2 +- |
| 25 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 26 | |
| 27 | diff --git a/iscsiuio/src/unix/libs/bnx2x.c b/iscsiuio/src/unix/libs/bnx2x.c |
| 28 | index 3df6d5f..62530d1 100644 |
| 29 | --- a/iscsiuio/src/unix/libs/bnx2x.c |
| 30 | +++ b/iscsiuio/src/unix/libs/bnx2x.c |
| 31 | @@ -36,6 +36,7 @@ |
| 32 | * bnx2x.c - bnx2x user space driver |
| 33 | * |
| 34 | */ |
| 35 | +#include "nic.h" |
| 36 | #include <errno.h> |
| 37 | #include <stdio.h> |
| 38 | #include <string.h> |
| 39 | @@ -58,7 +59,6 @@ |
| 40 | #include "bnx2x.h" |
| 41 | #include "cnic.h" |
| 42 | #include "logger.h" |
| 43 | -#include "nic.h" |
| 44 | #include "nic_id.h" |
| 45 | #include "nic_utils.h" |
| 46 | #include "options.h" |
| 47 | -- |
| 48 | 2.16.1 |
| 49 | |