Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2011-05-20 14:21:55 -04:00
commit cbab7dad72

View File

@ -181,7 +181,7 @@ long _evutil_weakrand(void);
/* Evaluates to the same boolean value as 'p', and hints to the compiler that /* Evaluates to the same boolean value as 'p', and hints to the compiler that
* we expect this value to be false. */ * we expect this value to be false. */
#ifdef __GNUC__ #if defined(__GNUC__) && __GNUC__ >= 3 /* gcc 3.0 or later */
#define EVUTIL_UNLIKELY(p) __builtin_expect(!!(p),0) #define EVUTIL_UNLIKELY(p) __builtin_expect(!!(p),0)
#else #else
#define EVUTIL_UNLIKELY(p) (p) #define EVUTIL_UNLIKELY(p) (p)