<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40461 >
> This patch fixes IPv4 compilation if platform does not have > inet_aton() (Windows) Fixed two more places where inet_aton() used. - ML
diff -Nurd -X.diff_ignore freeciv/client/servers.c freeciv/client/servers.c --- freeciv/client/servers.c 2008-08-21 03:06:19.000000000 +0300 +++ freeciv/client/servers.c 2008-08-25 21:47:36.000000000 +0300 @@ -584,7 +584,11 @@ #ifndef IPV6_SUPPORT { +#ifdef HAVE_INET_ATON inet_aton(group, &addr.saddr_in4.sin_addr); +#else /* HAVE_INET_ATON */ + addr.saddr_in4.sin_addr.s_addr = inet_addr(group); +#endif /* HAVE_INET_ATON */ #else /* IPv6 support */ if (family == AF_INET6) { addr.saddr.sa_family = AF_INET6; @@ -667,8 +671,12 @@ #ifndef IPV6_SUPPORT { +#ifdef HAVE_INET_ATON inet_aton(group, &mreq4.imr_multiaddr); -#else +#else /* HAVE_INET_ATON */ + mreq4.imr_multiaddr.s_addr = inet_addr(group); +#endif /* HAVE_INET_ATON */ +#else /* IPv6 support */ if (family == AF_INET6) { inet_pton(AF_INET6, group, &mreq6.ipv6mr_multiaddr.s6_addr); mreq6.ipv6mr_interface = 0; /* TODO: Interface selection */ diff -Nurd -X.diff_ignore freeciv/server/sernet.c freeciv/server/sernet.c --- freeciv/server/sernet.c 2008-08-21 03:06:19.000000000 +0300 +++ freeciv/server/sernet.c 2008-08-25 21:30:39.000000000 +0300 @@ -1013,8 +1013,12 @@ #ifndef IPV6_SUPPORT { +#ifdef HAVE_INET_ATON inet_aton(group, &mreq4.imr_multiaddr); -#else +#else /* HEVE_INET_ATON */ + mreq4.imr_multiaddr.s_addr = inet_addr(group); +#endif /* HAVE_INET_ATON */ +#else /* IPv6 support */ if (addr.saddr.sa_family == AF_INET6) { inet_pton(AF_INET6, group, &mreq6.ipv6mr_multiaddr.s6_addr); mreq6.ipv6mr_interface = 0; /* TODO: Interface selection */
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev