# HG changeset patch
# User diego
# Date 1223120820 0
# Node ID e8a6f7b7ed4ed20ebf2d0555f712c5b744432ba4
# Parent  c8a241b4b92a9688ea072b05d02ce13e249ac629
Do not duplicate likely/unlikely #defines from libmpeg2/libavcodec in config.h.

diff -r c8a241b4b92a -r e8a6f7b7ed4e configure
--- a/configure	Sat Oct 04 11:42:39 2008 +0000
+++ b/configure	Sat Oct 04 11:47:00 2008 +0000
@@ -8033,13 +8033,6 @@
 
 /* __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)