diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 23:30:18 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 23:30:21 +0300 |
commit | 7a0e085ec5fe19eaa38f1a39bb0b8842fe548c89 (patch) | |
tree | 436fd46fa0c5c7e51a0907fadf121b52391776fe | |
parent | 77c3908d5cd076d343554d0f73360a00b5fc90ab (diff) | |
parent | c6e0829e3696c894d24c8088c3ee30a9c17534c2 (diff) |
Merge commit 'c6e0829e3696c894d24c8088c3ee30a9c17534c2'
* commit 'c6e0829e3696c894d24c8088c3ee30a9c17534c2':
configure: Don't force _WIN32_WINNT to an older version if targeting winphone/winrt
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
-rwxr-xr-x | configure | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -4528,8 +4528,19 @@ probe_libc(){ # in such new versions and producing binaries requiring windows 7.0. # Therefore explicitly set the default to XP unless the user has # set something else on the command line. + # Don't do this if WINAPI_FAMILY is set and is set to a non-desktop + # family. For these cases, configure is free to use any functions + # found in the SDK headers by default. (Alternatively, we could force + # _WIN32_WINNT to 0x0602 in that case.) check_${pfx}cpp_condition stdlib.h "defined(_WIN32_WINNT)" || - add_${pfx}cppflags -D_WIN32_WINNT=0x0502 + { check_${pfx}cpp <<EOF && add_${pfx}cppflags -D_WIN32_WINNT=0x0502; } +#ifdef WINAPI_FAMILY +#include <winapifamily.h> +#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) +#error not desktop +#endif +#endif +EOF 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 |