Hi,
On 02/02/2015 03:02 AM, Cunming Liang wrote:
> Some macro already been defined by freebsd 'sys/param.h'.
>
> Signed-off-by: Cunming Liang <cunming.liang at intel.com>
> ---
> lib/librte_pmd_enic/enic.h | 1 +
> lib/librte_pmd_enic/enic_compat.h | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/lib/librte_pmd_enic/enic.h b/lib/librte_pmd_enic/enic.h
> index c43417c..189c3b9 100644
> --- a/lib/librte_pmd_enic/enic.h
> +++ b/lib/librte_pmd_enic/enic.h
> @@ -66,6 +66,7 @@
> #define ENIC_CALC_IP_CKSUM 1
> #define ENIC_CALC_TCP_UDP_CKSUM 2
> #define ENIC_MAX_MTU 9000
> +#undef PAGE_SIZE
> #define PAGE_SIZE 4096
> #define PAGE_ROUND_UP(x) \
> ((((unsigned long)(x)) + PAGE_SIZE-1) & (~(PAGE_SIZE-1)))
> diff --git a/lib/librte_pmd_enic/enic_compat.h
> b/lib/librte_pmd_enic/enic_compat.h
> index b1af838..b84c766 100644
> --- a/lib/librte_pmd_enic/enic_compat.h
> +++ b/lib/librte_pmd_enic/enic_compat.h
> @@ -67,6 +67,7 @@
> #define pr_warn(y, args...) dev_warning(0, y, ##args)
> #define BUG() pr_err("BUG at %s:%d", __func__, __LINE__)
>
> +#undef ALIGN
> #define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1)
> #define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask))
> #define udelay usleep
>
Is the issue caused by a change you've made previously in the patch
series?
Wouldn't it be better to rename the macros in enic instead of doing
#undef?
Regards,
Olivier
