From 2d6cbcaa4d38c886aac016e9d2de5b5c998d6cd5 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Tue, 16 Jun 2020 23:47:04 +0200 Subject: [PATCH] meson: set windows variables for AI_ADDRCONFIG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pavel Hrdina Reviewed-by: Ján Tomko Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- configure.ac | 4 ---- meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d53525084b..34b9b258f8 100644 --- a/configure.ac +++ b/configure.ac @@ -154,10 +154,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"]) if test "$with_win" = "yes" ; then # We don't support the daemon yet with_libvirtd=no - - # For AI_ADDRCONFIG - AC_DEFINE([_WIN32_WINNT], [0x0600], [Win Vista / Server 2008]) - AC_DEFINE([WINVER], [0x0600], [Win Vista / Server 2008]) fi # The daemon requires remote support. Likewise, if we are not using diff --git a/meson.build b/meson.build index 54e6c1732e..122c1adec1 100644 --- a/meson.build +++ b/meson.build @@ -37,6 +37,12 @@ conf.set_quoted('PACKAGE_NAME', meson.project_name()) conf.set_quoted('PACKAGE_VERSION', meson.project_version()) conf.set_quoted('VERSION', meson.project_version()) +if host_machine.system() == 'windows' + # For AI_ADDRCONFIG + conf.set('_WIN32_WINNT', '0x0600') # Win Vista / Server 2008 + conf.set('WINVER', '0x0600') # Win Vista / Server 2008 +endif + # set various paths