Re: [dpdk-dev] [PATCH] cmdline: replace FreeBSD ifdef for IP address parsing

[Stephen Hemminger <stephen@networkplumber.org>]

On Wed,  6 Nov 2019 13:09:43 +0100
Thomas Monjalon <thomas@monjalon.net> wrote:

> The constants like AF_INET are in sys/socket.h in FreeBSD.
> The #ifdef macro __FreeBSD__ is replaced with RTE_EXEC_ENV_FREEBSD
> in order to be consistent across DPDK files, and allow to grep
> for EXEC_ENV among other benefits.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
>  app/test-pmd/cmdline.c                    | 2 +-
>  app/test/test_cmdline_ipaddr.c            | 2 +-
>  examples/cmdline/commands.c               | 2 +-
>  lib/librte_cmdline/cmdline_parse_ipaddr.c | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index 4478069911..74e02d6813 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -11,7 +11,7 @@
>  #include <termios.h>
>  #include <unistd.h>
>  #include <inttypes.h>
> -#ifdef __FreeBSD__
> +#ifdef RTE_EXEC_ENV_FREEBSD
>  #include <sys/socket.h>
>  #endif
>  #include <netinet/in.h>
> diff --git a/app/test/test_cmdline_ipaddr.c b/app/test/test_cmdline_ipaddr.c
> index 2d11ce936c..315ac3a9f8 100644
> --- a/app/test/test_cmdline_ipaddr.c
> +++ b/app/test/test_cmdline_ipaddr.c
> @@ -6,7 +6,7 @@
>  #include <string.h>
>  #include <inttypes.h>
>  #include <netinet/in.h>
> -#ifdef __FreeBSD__
> +#ifdef RTE_EXEC_ENV_FREEBSD
>  #include <sys/socket.h>
>  #endif
>  
> diff --git a/examples/cmdline/commands.c b/examples/cmdline/commands.c
> index 1249ee7a8a..4badffc257 100644
> --- a/examples/cmdline/commands.c
> +++ b/examples/cmdline/commands.c
> @@ -12,7 +12,7 @@
>  #include <errno.h>
>  #include <netinet/in.h>
>  #include <termios.h>
> -#ifdef __FreeBSD__
> +#ifdef RTE_EXEC_ENV_FREEBSD
>  #include <sys/socket.h>
>  #endif
>  
> diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/librte_cmdline/cmdline_parse_ipaddr.c
> index 848c1eb07d..4de5ba35ae 100644
> --- a/lib/librte_cmdline/cmdline_parse_ipaddr.c
> +++ b/lib/librte_cmdline/cmdline_parse_ipaddr.c
> @@ -13,7 +13,7 @@
>  #include <errno.h>
>  #include <arpa/inet.h>
>  #include <netinet/in.h>
> -#ifdef __FreeBSD__
> +#ifdef RTE_EXEC_ENV_FREEBSD
>  #include <sys/socket.h>
>  #endif
>  

Why not always include sys/socket.h having an extra include
is much less of a nuisance than a silly #ifdef.