From c6f54dc53ea76f9bb3d669193d17f560e245199e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 26 May 2021 03:29:22 +0300 Subject: [PATCH 48/48] Meson: Set FREECIV_SOCKET_ZERO_NOT_STDIN in Windows See osdn #42396 Signed-off-by: Marko Lindqvist --- gen_headers/meson_freeciv_config.h.in | 3 +++ meson.build | 1 + 2 files changed, 4 insertions(+) diff --git a/gen_headers/meson_freeciv_config.h.in b/gen_headers/meson_freeciv_config.h.in index 657078c453..c711a07b6f 100644 --- a/gen_headers/meson_freeciv_config.h.in +++ b/gen_headers/meson_freeciv_config.h.in @@ -114,6 +114,9 @@ #define FREECIV_HAVE_WINSOCK2 1 #endif +/* socket zero isn't same as stdin */ +#mesondefine FREECIV_SOCKET_ZERO_NOT_STDIN + /* jansson network protocol in use */ #mesondefine FREECIV_JSON_CONNECTION diff --git a/meson.build b/meson.build index 9de0e2dc97..c49600c050 100644 --- a/meson.build +++ b/meson.build @@ -284,6 +284,7 @@ if host_system == 'windows' pub_conf_data.set('FREECIV_MSWINDOWS', 1) pub_conf_data.set('FREECIV_HAVE_TINYCTHR', 1) pub_conf_data.set('FREECIV_HAVE_WINSOCK', 1) + pub_conf_data.set('FREECIV_SOCKET_ZERO_NOT_STDIN', 1) priv_conf_data.set('ALWAYS_ROOT', 1) add_global_arguments('-D_WIN32_WINNT=0x0601', language : 'c') ws2_dep = c_compiler.find_library('ws2_32') -- 2.30.2