diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-12-28 01:07:42 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-12-28 01:07:42 +0100 |
| commit | 1e41f36c5671df879062d1ea52c8b57b6fc2d44f (patch) | |
| tree | 0ab730bd3b7113ed9014fb03493aed86622e6606 /extra | |
| parent | c8f6457f650845ab1f9e04b2136b8351e4d465aa (diff) | |
| parent | 471437fd47bc10ce89b290c46ffcbb260aaa12f4 (diff) | |
| download | mariadb-git-1e41f36c5671df879062d1ea52c8b57b6fc2d44f.tar.gz | |
Merge mysql.com:/home/kent/bk/windows-cleanup/mysql-5.0-build
into mysql.com:/home/kent/bk/windows-cleanup/mysql-5.1-build
extra/CMakeLists.txt:
Auto merged
extra/resolveip.c:
Auto merged
scripts/CMakeLists.txt:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/make_win_bin_dist:
Auto merged
scripts/mysql_convert_table_format.sh:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
Auto merged
BitKeeper/deleted/.del-mysql_tableinfo.sh~c715458838a2a818:
Auto merged
Diffstat (limited to 'extra')
| -rwxr-xr-x | extra/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | extra/resolveip.c | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 42561a97888..cec0db6a4ae 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 b61c0871aaf..97837e191b5 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> |