Author: cazfi Date: Fri Jan 30 05:05:03 2015 New Revision: 27904 URL: http://svn.gna.org/viewcvs/freeciv?rev=27904&view=rev Log: Consider any kind of sockaddr size to be size of whole fc_sockaddr union in Windows builds.
See bug #22448 Modified: branches/S2_6/utility/netintf.c Modified: branches/S2_6/utility/netintf.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/netintf.c?rev=27904&r1=27903&r2=27904&view=diff ============================================================================== --- branches/S2_6/utility/netintf.c (original) +++ branches/S2_6/utility/netintf.c Fri Jan 30 05:05:03 2015 @@ -295,6 +295,9 @@ ***************************************************************************/ int sockaddr_size(union fc_sockaddr *addr) { +#ifdef WIN32_NATIVE + return sizeof(*addr); +#else #ifdef IPV6_SUPPORT if (addr->saddr.sa_family == AF_INET6) { return sizeof(addr->saddr_in6); @@ -305,10 +308,11 @@ } else { fc_assert(FALSE); - log_error("Unsupported address family in socaddr_size()"); + log_error("Unsupported address family in sockaddr_size()"); return 0; } +#endif /* WIN32_NATIVE */ } /*************************************************************************** _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits