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

1 files changed, 8 insertions, 0 deletions

diff --git a/extra/resolveip.c b/extra/resolveip.c
index 9f936fa60b4..5f2a9269f62 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -118,13 +118,21 @@ int main(int argc, char **argv)
 
   while (argc--)
   {
+#ifndef WIN32
     struct in_addr addr;
+#endif
     ip = *argv++;    
 
     /* 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)
     {
       taddr= addr.s_addr;
+#endif
       if (taddr == htonl(INADDR_BROADCAST))
       {	
 	puts("Broadcast");