# HG changeset patch # User diego # Date 1223142942 0 # Node ID b6e2b2e52bba8ff6df6e51d80f137fad22c92e28 # Parent d55c174faeba0543ca240c9d935bb33e80c85dfd Revert the removal of the likely/unlikely macros, they are still used. diff -r d55c174faeba -r b6e2b2e52bba configure --- a/configure Sat Oct 04 17:15:39 2008 +0000 +++ b/configure Sat Oct 04 17:55:42 2008 +0000 @@ -8112,8 +8112,15 @@ /* "restrict" keyword */ $_def_restrict_keyword -/* __builtin_expect branch prediction hint, libmpeg2 + FFmpeg */ +/* __builtin_expect branch prediction hint */ $_def_builtin_expect +#ifdef HAVE_BUILTIN_EXPECT +#define likely(x) __builtin_expect ((x) != 0, 1) +#define unlikely(x) __builtin_expect ((x) != 0, 0) +#else +#define likely(x) (x) +#define unlikely(x) (x) +#endif /* attribute(used) as needed by some compilers */ #if (__GNUC__ * 100 + __GNUC_MINOR__ >= 300)