From 7136bb0105e37607c98a6290a3355f9490a70993 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 16 Oct 2008 18:26:01 +0000
Subject: Move likely/unlikely macros to libmpdemux/demuxer.h where they are
 used. config.h should only contain option definitions, no logic.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27786 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure            | 7 -------
 libmpdemux/demuxer.h | 8 ++++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index ab0a770b87..1448ae024a 100755
--- a/configure
+++ b/configure
@@ -8166,13 +8166,6 @@ $_def_restrict_keyword
 
 /* __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
 
 /* compiler support for named assembler arguments */
 $_def_named_asm_args
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index edd13c404f..a97f3746db 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -11,6 +11,14 @@
 #include "libass/ass_types.h"
 #endif
 
+#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
+
 #define MAX_PACKS 4096
 #ifdef CONFIG_TV_BSDBT848
 #define MAX_PACK_BYTES 0x2000000
-- 
cgit v1.2.3