From 18418ff8c5c6d3700bc199417d0dd57af7d9b918 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com/kent-amd64.(none)" <>
Date: Fri, 28 Dec 2007 01:02:28 +0100
Subject: make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:   Better
 Windows support in the scripts directory mysql_config.pl.in,
 mysql_install_db.pl.in:   New Perl version of Unix shell script, mainly for
 Windows Many files in scripts directory:   Use default Perl location
 "#!/usr/bin/perl" instead of the build host path

---
 extra/CMakeLists.txt |  3 +++
 extra/resolveip.c    | 14 ++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'extra')

diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index a909bc93820..c1477e41a81 100755
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -44,6 +44,9 @@ TARGET_LINK_LIBRARIES(my_print_defaults strings mysys debug dbug taocrypt wsock3
 ADD_EXECUTABLE(perror perror.c)
 TARGET_LINK_LIBRARIES(perror strings mysys debug dbug wsock32)
 
+ADD_EXECUTABLE(resolveip resolveip.c)
+TARGET_LINK_LIBRARIES(resolveip strings mysys debug dbug wsock32)
+
 ADD_EXECUTABLE(replace replace.c)
 TARGET_LINK_LIBRARIES(replace strings mysys debug dbug wsock32)
 
diff --git a/extra/resolveip.c b/extra/resolveip.c
index 1061cafe380..b48a782c9c9 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -21,13 +21,15 @@
 #include <m_ctype.h>
 #include <my_sys.h>
 #include <m_string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#ifndef HAVE_BROKEN_NETINET_INCLUDES
-#include <netinet/in.h>
+#ifndef WIN32
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  ifndef HAVE_BROKEN_NETINET_INCLUDES
+#    include <netinet/in.h>
+#  endif
+#  include <arpa/inet.h>
+#  include <netdb.h>
 #endif
-#include <arpa/inet.h>
-#include <netdb.h>
 #include <my_net.h>
 #include <my_getopt.h>
 
-- 
cgit v1.2.1