diff mbox series

cmdline: remove unnecessary #ifdef

Message ID 20191108180035.7991-1-stephen@networkplumber.org (mailing list archive)
State Accepted, archived
Delegated to: David Marchand
Headers
Series cmdline: remove unnecessary #ifdef |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/travis-robot warning Travis build: failed
ci/Intel-compilation fail apply issues

Commit Message

Stephen Hemminger Nov. 8, 2019, 6 p.m. UTC 
  The #ifdef to conditionally include <sys/socket.h> on BSD
is unnecessary. It is harmless to include the header on other
OS's. An extra include is better than an #ifdef.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 app/test-pmd/cmdline.c                    | 2 --
 app/test/test_cmdline_ipaddr.c            | 2 --
 lib/librte_cmdline/cmdline_parse_ipaddr.c | 2 --
 3 files changed, 6 deletions(-)

Comments

Bruce Richardson Nov. 11, 2019, 10:41 a.m. UTC | #1 
On Fri, Nov 08, 2019 at 10:00:35AM -0800, Stephen Hemminger wrote:
> The #ifdef to conditionally include <sys/socket.h> on BSD
> is unnecessary. It is harmless to include the header on other
> OS's. An extra include is better than an #ifdef.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>  app/test-pmd/cmdline.c                    | 2 --
>  app/test/test_cmdline_ipaddr.c            | 2 --
>  lib/librte_cmdline/cmdline_parse_ipaddr.c | 2 --
>  3 files changed, 6 deletions(-)
> 
Seems reasonable

Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Olivier Matz Nov. 12, 2019, 8:10 a.m. UTC | #2 
On Fri, Nov 08, 2019 at 10:00:35AM -0800, Stephen Hemminger wrote:
> The #ifdef to conditionally include <sys/socket.h> on BSD
> is unnecessary. It is harmless to include the header on other
> OS's. An extra include is better than an #ifdef.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

Acked-by: Olivier Matz <olivier.matz@6wind.com>

Thanks
David Marchand Nov. 12, 2019, 7:14 p.m. UTC | #3 
On Tue, Nov 12, 2019 at 9:11 AM Olivier Matz <olivier.matz@6wind.com> wrote:
>
> On Fri, Nov 08, 2019 at 10:00:35AM -0800, Stephen Hemminger wrote:
> > The #ifdef to conditionally include <sys/socket.h> on BSD
> > is unnecessary. It is harmless to include the header on other
> > OS's. An extra include is better than an #ifdef.
> >
> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> Acked-by: Olivier Matz <olivier.matz@6wind.com>

Applied, thanks.



--
David Marchand
diff mbox series

Patch

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 74e02d68130f..4e5b3afd0916 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -11,9 +11,7 @@ 
 #include <termios.h>
 #include <unistd.h>
 #include <inttypes.h>
-#ifdef RTE_EXEC_ENV_FREEBSD
 #include <sys/socket.h>
-#endif
 #include <netinet/in.h>
 
 #include <sys/queue.h>
diff --git a/app/test/test_cmdline_ipaddr.c b/app/test/test_cmdline_ipaddr.c
index 315ac3a9f8af..088cd5afc3ad 100644
--- a/app/test/test_cmdline_ipaddr.c
+++ b/app/test/test_cmdline_ipaddr.c
@@ -6,9 +6,7 @@ 
 #include <string.h>
 #include <inttypes.h>
 #include <netinet/in.h>
-#ifdef RTE_EXEC_ENV_FREEBSD
 #include <sys/socket.h>
-#endif
 
 #include <rte_string_fns.h>
 
diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/librte_cmdline/cmdline_parse_ipaddr.c
index 4de5ba35aecc..f8dbdf204c29 100644
--- a/lib/librte_cmdline/cmdline_parse_ipaddr.c
+++ b/lib/librte_cmdline/cmdline_parse_ipaddr.c
@@ -13,9 +13,7 @@ 
 #include <errno.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
-#ifdef RTE_EXEC_ENV_FREEBSD
 #include <sys/socket.h>
-#endif
 
 #include <rte_string_fns.h>