summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-04 17:55:42 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-04 17:55:42 +0000
commit6fb9d58116938f5d869f40d6ffc62cf4ef7227f0 (patch)
treebaa69a5d094b4d9e90fb252161b17b5fe40b584c /configure
parent036b3d0c5171e211ed3aa5f29973bde4268b603c (diff)
downloadmpv-6fb9d58116938f5d869f40d6ffc62cf4ef7227f0.tar.bz2
mpv-6fb9d58116938f5d869f40d6ffc62cf4ef7227f0.tar.xz
Revert the removal of the likely/unlikely macros, they are still used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27717 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 8 insertions, 1 deletions
diff --git a/configure b/configure
index 0dfa2ac3ae..fccf0840d6 100755
--- a/configure
+++ b/configure
@@ -8112,8 +8112,15 @@ $_def_stream_cache
/* "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)