Mercurial > mplayer.hg
changeset 27752:bfebea06911d
Move likely/unlikely macros to libmpdemux/demuxer.h where they are used.
config.h should only contain option definitions, no logic.
| author | diego |
|---|---|
| date | Thu, 16 Oct 2008 18:26:01 +0000 |
| parents | d120b2951b37 |
| children | 6c915906bbc6 |
| files | configure libmpdemux/demuxer.h |
| diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Oct 16 18:24:18 2008 +0000 +++ b/configure Thu Oct 16 18:26:01 2008 +0000 @@ -8166,13 +8166,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 /* compiler support for named assembler arguments */ $_def_named_asm_args
--- a/libmpdemux/demuxer.h Thu Oct 16 18:24:18 2008 +0000 +++ b/libmpdemux/demuxer.h Thu Oct 16 18:26:01 2008 +0000 @@ -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