Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


extra/resolveip.c:
  Auto merged
This commit is contained in:
unknown 2008-02-13 14:44:56 +01:00
commit e08c867e73

View file

@ -118,13 +118,21 @@ int main(int argc, char **argv)
while (argc--) while (argc--)
{ {
#ifndef WIN32
struct in_addr addr; struct in_addr addr;
#endif
ip = *argv++; ip = *argv++;
/* Not compatible with IPv6! Probably should use getnameinfo(). */ /* Not compatible with IPv6! Probably should use getnameinfo(). */
#ifdef WIN32
taddr = inet_addr(ip);
if(taddr != INADDR_NONE)
{
#else
if (inet_aton(ip, &addr) != 0) if (inet_aton(ip, &addr) != 0)
{ {
taddr= addr.s_addr; taddr= addr.s_addr;
#endif
if (taddr == htonl(INADDR_BROADCAST)) if (taddr == htonl(INADDR_BROADCAST))
{ {
puts("Broadcast"); puts("Broadcast");