From 60a3df650d523bd2e4bb4f77f9278f25f7f1a65c Mon Sep 17 00:00:00 2001
From: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Date: Mon, 15 Dec 2014 16:55:02 +0000
Subject: [PATCH] eal: fix unused value warning in memcpy macro
GCC 4.5.1 from SUSE throws this error:
lib/librte_pmd_enic/enic_main.c:862:2: error: value computed is not used
This change use statements in expressions C extension provided by gcc to avoid
'value computed is not used' warning/error when size is not known at compile
time.
Reported-by: Michael Qiu <michael.qiu@intel.com>
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Acked-by: Michael Qiu <michael.qiu@intel.com>
[Thomas: apply same fix to ppc_64]
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h | 4 ++--
lib/librte_eal/common/include/arch/x86/rte_memcpy.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h b/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h
index 31daa0d997..acf7aac237 100644
--- a/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h
+++ b/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h
@@ -95,9 +95,9 @@ rte_mov256(uint8_t *dst, const uint8_t *src)
}
#define rte_memcpy(dst, src, n) \
- ((__builtin_constant_p(n)) ? \
+ ({ (__builtin_constant_p(n)) ? \
memcpy((dst), (src), (n)) : \
- rte_memcpy_func((dst), (src), (n)))
+ rte_memcpy_func((dst), (src), (n)); })
static inline void *
rte_memcpy_func(void *dst, const void *src, size_t n)
diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h
index 290c5cd566..fb9eba87c8 100644
--- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h
+++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h
@@ -169,9 +169,9 @@ rte_mov256(uint8_t *dst, const uint8_t *src)
}
#define rte_memcpy(dst, src, n) \
- ((__builtin_constant_p(n)) ? \
+ ({ (__builtin_constant_p(n)) ? \
memcpy((dst), (src), (n)) : \
- rte_memcpy_func((dst), (src), (n)))
+ rte_memcpy_func((dst), (src), (n)); })
static inline void *
rte_memcpy_func(void *dst, const void *src, size_t n)
--
2.39.5