common: guard likly macros with #ifdef

DPDK also defines them.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/common/likely.h b/src/common/likely.h
index c095dd39d3bd0cc9f1757e6116313dfb5cf8a420..abaf2d2e2d52cc7faa2ce9af42d7c03bf749f3fe 100644 (file)
--- a/src/common/likely.h
+++ b/src/common/likely.h
@@ -18,9 +18,14 @@
 /*
  * Likely / Unlikely macros
  */
+#ifndef likely
 #define likely(x)       __builtin_expect((x),1)
+#endif
+#ifndef unlikely
 #define unlikely(x)     __builtin_expect((x),0)
-
+#endif
+#ifndef expect
 #define expect(x, hint) __builtin_expect((x),(hint))
+#endif
 
 #endif