From: Helin Zhang <helin.zhang@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH] bond: fix for compile issue on 32 bits Oracle Linux 6.4
Date: Wed, 2 Jul 2014 15:29:52 +0800 [thread overview]
Message-ID: <1404286192-10884-1-git-send-email-helin.zhang@intel.com> (raw)
The compile error on 32 bits Oracle Linux 6.4 is as below.
******
Kernel: 2.6.39
GCC: 4.4.7 20120313
In file included from /usr/include/stdlib.h:320,
from /home/dpdk/i686-native-linuxapp-gcc/include/rte_mempool.h:63,
from /home/dpdk/i686-native-linuxapp-gcc/include/rte_mbuf.h:61,
from /home/dpdk/lib/librte_pmd_bond/rte_eth_bond_api.c:37:
/usr/include/sys/types.h:61: error: conflicting types for dev_t
/usr/include/linux/types.h:22: note: previous declaration of dev_t was here
/usr/include/sys/types.h:66: error: conflicting types for gid_t
/usr/include/linux/types.h:52: note: previous declaration of gid_t was here
/usr/include/sys/types.h:71: error: conflicting types for mode_t
/usr/include/linux/types.h:24: note: previous declaration of mode_t was here
/usr/include/sys/types.h:76: error: conflicting types for nlink_t
/usr/include/linux/types.h:25: note: previous declaration of nlink_t was here
/usr/include/sys/types.h:81: error: conflicting types for uid_t
/usr/include/linux/types.h:51: note: previous declaration of uid_t was here
***
Signed-off-by: Helin Zhang <helin.zhang@intel.com>
Acked-by: Cunming Liang <cunming.liang@intel.com>
---
lib/librte_pmd_bond/rte_eth_bond_api.c | 14 ++------------
lib/librte_pmd_bond/rte_eth_bond_pmd.c | 15 +++++----------
2 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/lib/librte_pmd_bond/rte_eth_bond_api.c b/lib/librte_pmd_bond/rte_eth_bond_api.c
index 9be5f72..75f5694 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_api.c
+++ b/lib/librte_pmd_bond/rte_eth_bond_api.c
@@ -31,20 +31,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/queue.h>
-#include <linux/binfmts.h>
-
#include <rte_mbuf.h>
-#include <rte_cycles.h>
-#include <rte_dev.h>
-#include <rte_devargs.h>
-#include <rte_ethdev.h>
-#include <rte_ip.h>
-#include <rte_kvargs.h>
#include <rte_malloc.h>
-#include <rte_memcpy.h>
-#include <rte_memory.h>
-#include <rte_udp.h>
+#include <rte_ethdev.h>
+#include <rte_tcp.h>
#include "rte_eth_bond.h"
#include "rte_eth_bond_private.h"
diff --git a/lib/librte_pmd_bond/rte_eth_bond_pmd.c b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
index aa910ba..048de7f 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_pmd.c
+++ b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
@@ -31,20 +31,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/queue.h>
-#include <linux/binfmts.h>
-
#include <rte_mbuf.h>
-#include <rte_cycles.h>
-#include <rte_dev.h>
-#include <rte_devargs.h>
+#include <rte_malloc.h>
#include <rte_ethdev.h>
+#include <rte_tcp.h>
+#include <rte_udp.h>
#include <rte_ip.h>
+#include <rte_devargs.h>
#include <rte_kvargs.h>
-#include <rte_malloc.h>
-#include <rte_memcpy.h>
-#include <rte_memory.h>
-#include <rte_udp.h>
+#include <rte_dev.h>
#include "rte_eth_bond.h"
#include "rte_eth_bond_private.h"
--
1.8.1.4
next reply other threads:[~2014-07-02 7:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-02 7:29 Helin Zhang [this message]
2014-07-02 8:57 ` 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=1404286192-10884-1-git-send-email-helin.zhang@intel.com \
--to=helin.zhang@intel.com \
--cc=dev@dpdk.org \
/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).