From: Ben Pfaff <blp@nicira.com>
Date: Thu, 11 Feb 2010 19:37:30 +0000 (-0800)
Subject: compiler: Remove "likely" and "unlikely" macros, since we don't use them.
X-Git-Tag: v0.99.2~12
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=39e94ea4dbf60510965620859655fb78f4529404;p=sliver-openvswitch.git

compiler: Remove "likely" and "unlikely" macros, since we don't use them.

(The datapath uses these macros, but those come from Linux's kernel.h, not
from this file.)
---

diff --git a/lib/compiler.h b/lib/compiler.h
index 502a48cd1..ac1cd0fcb 100644
--- a/lib/compiler.h
+++ b/lib/compiler.h
@@ -23,7 +23,5 @@
 #define STRFTIME_FORMAT(FMT) __attribute__((__format__(__strftime__, FMT, 0)))
 #define MALLOC_LIKE __attribute__((__malloc__))
 #define ALWAYS_INLINE __attribute__((always_inline))
-#define likely(x) __builtin_expect((x),1)
-#define unlikely(x) __builtin_expect((x),0)
 
 #endif /* compiler.h */