diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 04:46:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 04:47:20 +0100 |
| commit | 2d4ef7c9054dfeb20531e70e3144a4bf8ffc8255 (patch) | |
| tree | 79680a71b4e0d0e14fd0a3c5ddd123e5bd7b4879 /configure | |
| parent | 8e70fdab3614a5ef709d60b67c6729c3eca93c21 (diff) | |
| parent | 19c20a0a1a46f61606fdc8f0eb6a4a59bac8b63f (diff) | |
| download | ffmpeg-2d4ef7c9054dfeb20531e70e3144a4bf8ffc8255.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Move adding of compat objects out of libc detection
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -3839,10 +3839,6 @@ elif check_cpp_condition _mingw.h "defined __MINGW32_VERSION"; then add_cppflags -U__STRICT_ANSI__ elif check_cpp_condition crtversion.h "defined _VC_CRT_MAJOR_VERSION"; then libc_type=msvcrt - add_compat strtod.o strtod=avpriv_strtod - add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \ - _snprintf=avpriv_snprintf \ - vsnprintf=avpriv_vsnprintf # The MSVC 2010 headers (Win 7.0 SDK) set _WIN32_WINNT to # 0x601 by default unless something else is set by the user. # This can easily lead to us detecting functions only present @@ -3854,11 +3850,22 @@ elif check_cpp_condition stddef.h "defined __KLIBC__"; then libc_type=klibc elif check_cpp_condition sys/cdefs.h "defined __BIONIC__"; then libc_type=bionic - add_compat strtod.o strtod=avpriv_strtod fi test -n "$libc_type" && enable $libc_type +case $libc_type in + bionic) + add_compat strtod.o strtod=avpriv_strtod + ;; + msvcrt) + add_compat strtod.o strtod=avpriv_strtod + add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \ + _snprintf=avpriv_snprintf \ + vsnprintf=avpriv_vsnprintf + ;; +esac + # hacks for compiler/libc/os combinations if enabled_all tms470 glibc; then |