dev.dpdk.org archive mirror
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>,
	Jingjing Wu <jingjing.wu@intel.com>,
	Bernard Iremonger <bernard.iremonger@intel.com>,
	Olivier Matz <olivier.matz@6wind.com>
Subject: [dpdk-dev] [PATCH] clean bare metal support traces
Date: Mon, 12 Aug 2019 09:00:54 +0200	[thread overview]
Message-ID: <1565593254-6017-1-git-send-email-david.marchand@redhat.com> (raw)

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


             reply	other threads:[~2019-08-12  7:01 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-12  7:00 David Marchand [this message]
2019-10-21 13:58 ` [dpdk-dev] [PATCH] clean bare metal support traces Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1565593254-6017-1-git-send-email-david.marchand@redhat.com \
    --to=david.marchand@redhat.com \
    --cc=bernard.iremonger@intel.com \
    --cc=dev@dpdk.org \
    --cc=jingjing.wu@intel.com \
    --cc=olivier.matz@6wind.com \
    --cc=wenzhuo.lu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).