summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-04 11:47:00 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-04 11:47:00 +0000
commit02c93f7b98d7634ad0c787675648b6d689b9837c (patch)
tree5742012acc05fd3a9c76d4d1bf6e1d741aac9356 /configure
parent6e916bbf28c95028420a9092828f6dd69b7181c4 (diff)
downloadmpv-02c93f7b98d7634ad0c787675648b6d689b9837c.tar.bz2
mpv-02c93f7b98d7634ad0c787675648b6d689b9837c.tar.xz
Do not duplicate likely/unlikely #defines from libmpeg2/libavcodec in config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27707 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 0 insertions, 7 deletions
diff --git a/configure b/configure
index 45dcfaf464..fa1d595065 100755
--- a/configure
+++ b/configure
@@ -8033,13 +8033,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
/* attribute(used) as needed by some compilers */
#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 300)