[MPlayer-cvslog] r27786 - in trunk: configure libmpdemux/demuxer.h

[diego]

Author: diego
Date: Thu Oct 16 20:26:01 2008
New Revision: 27786

Log:
Move likely/unlikely macros to libmpdemux/demuxer.h where they are used.
config.h should only contain option definitions, no code.


Modified:
   trunk/configure
   trunk/libmpdemux/demuxer.h

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Oct 16 20:26:01 2008
@@ -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

Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h	(original)
+++ trunk/libmpdemux/demuxer.h	Thu Oct 16 20:26:01 2008
@@ -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