summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorClément Bœsch <cboesch@gopro.com>2017-03-15 12:39:34 +0100
committerClément Bœsch <cboesch@gopro.com>2017-03-15 12:39:34 +0100
commit132523448ba495f392706b0d1e0625e6e8555d13 (patch)
tree1f54d4a1940cda5cc731628f0738bcf1f1d9f740 /configure
parent6426c58b1cb91b05699e19aab50763eabb63dc57 (diff)
parent56af0bc10f49654b5b5f3efe82c69a13bf15fc8b (diff)
Merge commit '56af0bc10f49654b5b5f3efe82c69a13bf15fc8b'
* commit '56af0bc10f49654b5b5f3efe82c69a13bf15fc8b': configure: Check for strtoll and redirect to _strtoi64 in the msvcrt block Also includes _strtoui64 in the check. Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index 1e2e774950..a91ab075bf 100755
--- a/configure
+++ b/configure
@@ -5055,6 +5055,10 @@ probe_libc(){
#endif
#endif
EOF
+ if [ "$pfx" = "" ]; then
+ check_func strtoll || add_cflags -Dstrtoll=_strtoi64
+ check_func strtoull || add_cflags -Dstrtoull=_strtoui64
+ fi
elif check_${pfx}cpp_condition stddef.h "defined __KLIBC__"; then
eval ${pfx}libc_type=klibc
elif check_${pfx}cpp_condition sys/cdefs.h "defined __BIONIC__"; then
@@ -6330,8 +6334,6 @@ elif enabled_any msvc icl; then
__declspec($_restrict) void* foo(int);
EOF
fi
- check_func strtoll || add_cflags -Dstrtoll=_strtoi64
- check_func strtoull || add_cflags -Dstrtoull=_strtoui64
# the new SSA optimzer in VS2015 U3 is mis-optimizing some parts of the code
# Issue has been fixed in MSVC v19.00.24218.
check_cpp_condition windows.h "_MSC_FULL_VER >= 190024218" ||