[dpdk-dev] [PATCH] clean bare metal support traces

[dpdk-dev] [PATCH] clean bare metal support traces

[David Marchand]

Bare metal support has been gone for quite some time but we still had
some checks on system includes.

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 app/test-pmd/cmdline.c                    | 6 +-----
 app/test/commands.c                       | 5 -----
 app/test/test_cmdline_ipaddr.c            | 7 +------
 examples/cmdline/commands.c               | 8 ++------
 lib/librte_cmdline/cmdline_parse_ipaddr.c | 6 +-----
 5 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 56783aa..e28b8ba 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -11,13 +11,9 @@
 #include <termios.h>
 #include <unistd.h>
 #include <inttypes.h>
-#ifndef __linux__
-#ifndef __FreeBSD__
-#include <net/socket.h>
-#else
+#ifdef __FreeBSD__
 #include <sys/socket.h>
 #endif
-#endif
 #include <netinet/in.h>
 
 #include <sys/queue.h>
diff --git a/app/test/commands.c b/app/test/commands.c
index 8d5a03a..3bf767b 100644
--- a/app/test/commands.c
+++ b/app/test/commands.c
@@ -10,11 +10,6 @@
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <termios.h>
-#ifndef __linux__
-#ifndef __FreeBSD__
-#include <net/socket.h>
-#endif
-#endif
 #include <inttypes.h>
 #include <errno.h>
 #include <sys/queue.h>
diff --git a/app/test/test_cmdline_ipaddr.c b/app/test/test_cmdline_ipaddr.c
index 8ee7f62..2d11ce9 100644
--- a/app/test/test_cmdline_ipaddr.c
+++ b/app/test/test_cmdline_ipaddr.c
@@ -6,14 +6,9 @@
 #include <string.h>
 #include <inttypes.h>
 #include <netinet/in.h>
-
-#ifndef __linux__
-#ifndef __FreeBSD__
-#include <net/socket.h>
-#else
+#ifdef __FreeBSD__
 #include <sys/socket.h>
 #endif
-#endif
 
 #include <rte_string_fns.h>
 
diff --git a/examples/cmdline/commands.c b/examples/cmdline/commands.c
index e96739f..1249ee7 100644
--- a/examples/cmdline/commands.c
+++ b/examples/cmdline/commands.c
@@ -12,12 +12,8 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include <termios.h>
-#ifndef __linux__
-	#ifdef __FreeBSD__
-		#include <sys/socket.h>
-	#else
-		#include <net/socket.h>
-	#endif
+#ifdef __FreeBSD__
+#include <sys/socket.h>
 #endif
 
 #include <cmdline_rdline.h>
diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/librte_cmdline/cmdline_parse_ipaddr.c
index 6647f56..848c1eb 100644
--- a/lib/librte_cmdline/cmdline_parse_ipaddr.c
+++ b/lib/librte_cmdline/cmdline_parse_ipaddr.c
@@ -13,13 +13,9 @@
 #include <errno.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
-#ifndef __linux__
-#ifndef __FreeBSD__
-#include <net/socket.h>
-#else
+#ifdef __FreeBSD__
 #include <sys/socket.h>
 #endif
-#endif
 
 #include <rte_string_fns.h>
 
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH] clean bare metal support traces

[Thomas Monjalon]

12/08/2019 09:00, David Marchand:
> Bare metal support has been gone for quite some time but we still had
> some checks on system includes.
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
>  app/test-pmd/cmdline.c                    | 6 +-----
>  app/test/commands.c                       | 5 -----
>  app/test/test_cmdline_ipaddr.c            | 7 +------
>  examples/cmdline/commands.c               | 8 ++------
>  lib/librte_cmdline/cmdline_parse_ipaddr.c | 6 +-----
>  5 files changed, 5 insertions(+), 27 deletions(-)

Applied, thanks for removing some lines :)