RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2013-01-13 13:55:22 +01:00
parent 93d1bff4d3
commit ec57c94ba2
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure vendored
View File

@ -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

2
demux/demux.h
View File

@ -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