summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-01-13 13:55:22 +0100
committerwm4 <wm4@nowhere>2013-01-13 13:55:22 +0100
commitec57c94ba2333d08cad49be31ade353af46b5709 (patch)
treed3b70345be793d7c14b9d0cd47b6d17204fbbe7f
parent93d1bff4d3dc188307f85b435e402440e5408b5e (diff)
downloadmpv-ec57c94ba2333d08cad49be31ade353af46b5709.tar.bz2
mpv-ec57c94ba2333d08cad49be31ade353af46b5709.tar.xz
configure: remove __builtin_expect check
Change the only usage of HAVE_BUILTIN_EXPECT, demux.h, to use an #ifdef instead. In theory, a configure check is better, but nobody does it this way anyway, and we seek to reduce the configure script.
-rwxr-xr-xconfigure20
-rw-r--r--demux/demux.h2
2 files changed, 1 insertions, 21 deletions
diff --git a/configure b/configure
index fb69fa5270..4db833de2e 100755
--- a/configure
+++ b/configure
@@ -1246,25 +1246,6 @@ fi
echores "$_gettext"
-echocheck "__builtin_expect"
-# GCC branch prediction hint
-cat > $TMPC << EOF
-static int foo(int a) {
- a = __builtin_expect(a, 10);
- return a == 10 ? 0 : 1;
-}
-int main(void) { return foo(10) && foo(0); }
-EOF
-_builtin_expect=no
-cc_check && _builtin_expect=yes
-if test "$_builtin_expect" = yes ; then
- def_builtin_expect='#define HAVE_BUILTIN_EXPECT 1'
-else
- def_builtin_expect='#undef HAVE_BUILTIN_EXPECT'
-fi
-echores "$_builtin_expect"
-
-
echocheck "mkstemp"
_mkstemp=no
define_statement_check "_XOPEN_SOURCE 600" "stdlib.h" 'mkstemp("")' && _mkstemp=yes
@@ -3324,7 +3305,6 @@ $def_vsscanf
/* system-specific features */
$def_asmalign_pot
-$def_builtin_expect
$def_dl
$def_dos_paths
$def_iconv
diff --git a/demux/demux.h b/demux/demux.h
index 13500c0372..c1e6c3be1c 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -32,7 +32,7 @@
struct MPOpts;
-#ifdef HAVE_BUILTIN_EXPECT
+#if (__GNUC__ >= 3)
#define likely(x) __builtin_expect((x) != 0, 1)
#define unlikely(x) __builtin_expect((x) != 0, 0)
#else