RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-18 13:35:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'

Browse Source 
* commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a':
  configure: Only redefine inline to __inline for msvc if necessary

Conflicts:
	configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-26 23:19:56 +02:00
commit 27e61a716c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -3680,7 +3680,7 @@ probe_cc(){
_ld_lib='lib%.a' _ld_lib='lib%.a'
_ld_path='-libpath:' _ld_path='-libpath:'
_flags='-nologo' _flags='-nologo'
_cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dinline=__inline -Dstrtoll=_strtoi64' _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dstrtoll=_strtoi64'
disable stripping disable stripping
elif $_cc --version 2>/dev/null | grep -q ^cparser; then elif $_cc --version 2>/dev/null | grep -q ^cparser; then
_type=cparser _type=cparser
@ -5683,6 +5683,17 @@ EOF
fi fi
fi fi
for pfx in "" host_; do
pfx_no_=${pfx%_}
varname=${pfx_no_}cc_type
eval "type=\$$varname"
if [ $type = "msvc" ]; then
check_${pfx}cc <<EOF || add_${pfx}cflags -Dinline=__inline
static inline int foo(int a) { return a; }
EOF
fi
done
case $as_type in case $as_type in
clang) clang)
add_asflags -Qunused-arguments add_asflags -Qunused-arguments