Merge remote-tracking branch 'dechamps/fsckwin' into 1.1

diff --combined src/net_setup.c
index 83fbc2d,3ed6fbb..92aa5db
--- 1/src/net_setup.c
--- 2/src/net_setup.c
+++ b/src/net_setup.c
@@@ -518,9 -518,6 +518,9 @@@ bool setup_myself_reloadable(void) 
        get_config_int(lookup_config(config_tree, "UDPDiscoveryInterval"), &udp_discovery_interval);
        get_config_int(lookup_config(config_tree, "UDPDiscoveryTimeout"), &udp_discovery_timeout);
  
 +      get_config_int(lookup_config(config_tree, "MTUInfoInterval"), &mtu_info_interval);
 +      get_config_int(lookup_config(config_tree, "UDPInfoInterval"), &udp_info_interval);
 +
        get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
        get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
  
@@@ -667,7 -664,7 +667,7 @@@ static bool add_listen_address(char *ad
        hint.ai_protocol = IPPROTO_TCP;
        hint.ai_flags = AI_PASSIVE;
  
- #ifdef HAVE_DECL_RES_INIT
+ #if HAVE_DECL_RES_INIT
        res_init();
  #endif
        int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);