pf-ring: protect definition of (un)likely

This patch makes (un)likely declared if and only if they are not
declared before.

diff --git a/src/util-optimize.h b/src/util-optimize.h
index 78eff1230e811330fa3ed1ebc1f6edaf80f05d98..134ee9d03721fb5da267fa3a975351430ee33c04 100644 (file)
--- a/src/util-optimize.h
+++ b/src/util-optimize.h
@@ -24,8 +24,12 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
+#ifndef likely
 #define likely(expr) __builtin_expect(!!(expr), 1)
+#endif
+#ifndef unlikely
 #define unlikely(expr) __builtin_expect(!!(expr), 0)
+#endif
 
 /** from http://en.wikipedia.org/wiki/Memory_ordering
  *