vlc/vlc-3.0 | branch: master | Martin Storsjö <[email protected]> | Wed Jul 11 22:24:06 2018 +0300| [1231bcfe6e3daf857f234d3abd7a337cd3671c6e] | committer: Martin Storsjo
configure: Make the new value of _WIN32_WINNT available to configure tests Definitions from AH_TOP aren't included in the configure checks. This was the original intent of e807c8e91. This makes sure configure checks and actual compilation are run with the same version defined. EDIT: Adapted to a different default version in the 3.0 branch. (cherry picked from commit 0a27328b5ac2bc0e417c70f048131f783b201d04) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=1231bcfe6e3daf857f234d3abd7a337cd3671c6e --- configure.ac | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 082fb3389f..99b31a7461 100644 --- a/configure.ac +++ b/configure.ac @@ -218,10 +218,14 @@ case "${host_os}" in CXXFLAGS="${CXXFLAGS} -static-libgcc" AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) - AH_TOP([#if defined(_WIN32) && (!defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0502)]) - AH_TOP([# undef _WIN32_WINNT]) - AH_TOP([# define _WIN32_WINNT 0x0502 /* Windows XP SP2 */]) - AH_TOP([#endif]) + AC_PREPROC_IFELSE([AC_LANG_PROGRAM( + [[#ifdef _WIN32_WINNT + # error _WIN32_WINNT already defined + #endif + ]],[[;]]) + ],[ + AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows XP SP2 APIs.]) + ]) AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.]) AC_DEFINE([_UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.]) AC_DEFINE([UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.]) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
