From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 1373B30D for ; Wed, 2 Jul 2014 09:30:02 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 02 Jul 2014 00:30:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,587,1400050800"; d="scan'208";a="537597695" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga001.jf.intel.com with ESMTP; 02 Jul 2014 00:29:59 -0700 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id s627TvOH012492; Wed, 2 Jul 2014 15:29:57 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id s627Tr4a010996; Wed, 2 Jul 2014 15:29:55 +0800 Received: (from hzhan75@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id s627TriK010992; Wed, 2 Jul 2014 15:29:53 +0800 From: Helin Zhang To: dev@dpdk.org Date: Wed, 2 Jul 2014 15:29:52 +0800 Message-Id: <1404286192-10884-1-git-send-email-helin.zhang@intel.com> X-Mailer: git-send-email 1.7.0.7 Subject: [dpdk-dev] [PATCH] bond: fix for compile issue on 32 bits Oracle Linux 6.4 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 07:30:03 -0000 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 Acked-by: Cunming Liang --- 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 -#include - #include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include +#include +#include #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 -#include - #include -#include -#include -#include +#include #include +#include +#include #include +#include #include -#include -#include -#include -#include +#include #include "rte_eth_bond.h" #include "rte_eth_bond_private.h" -- 1.8.1.4