common/sfc_efx: do not include libefx headers from efsys.h

[dpdk.git] / lib / librte_member / rte_member.h

diff --git a/lib/librte_member/rte_member.h b/lib/librte_member/rte_member.h
index 2ffb6db..c0689e2 100644 (file)
--- a/lib/librte_member/rte_member.h
+++ b/lib/librte_member/rte_member.h
@@ -51,6 +51,9 @@ extern "C" {
 
 #include <stdint.h>
 
+#include <rte_common.h>
+#include <rte_config.h>
+
 /** The set ID type that stored internally in hash table based set summary. */
 typedef uint16_t member_set_t;
 /** Invalid set ID used to mean no match found. */
@@ -65,7 +68,7 @@ typedef uint16_t member_set_t;
 #define RTE_MEMBER_NAMESIZE 32
 
 /** @internal Hash function used by membership library. */
-#if defined(RTE_ARCH_X86) || defined(RTE_MACHINE_CPUFLAG_CRC32)
+#if defined(RTE_ARCH_X86) || defined(__ARM_FEATURE_CRC32)
 #include <rte_hash_crc.h>
 #define MEMBER_HASH_FUNC       rte_hash_crc
 #else
@@ -75,9 +78,12 @@ typedef uint16_t member_set_t;
 
 extern int librte_member_logtype;
 
-#define RTE_MEMBER_LOG(level, fmt, args...) \
-rte_log(RTE_LOG_ ## level, librte_member_logtype, "%s(): " fmt, \
-       __func__, ## args)
+#define RTE_MEMBER_LOG(level, ...) \
+       rte_log(RTE_LOG_ ## level, \
+               librte_member_logtype, \
+               RTE_FMT("%s(): " RTE_FMT_HEAD(__VA_ARGS__,), \
+                       __func__, \
+                       RTE_FMT_TAIL(__VA_ARGS__,)))
 
 /** @internal setsummary structure. */
 struct rte_member_setsum;