diff options
| author | unknown <joerg@trift2.> | 2008-01-28 15:16:40 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2008-01-28 15:16:40 +0100 |
| commit | 69338e08c0ec776338806f810751e4a4923a96d6 (patch) | |
| tree | f31d846adbd71f7ec039800ea45b4d9ee6e630e6 /extra/resolveip.c | |
| parent | 4bacd53715ac860c6ba2d9c148f87d22cae9c62a (diff) | |
| parent | 66361a8090dfef929ea47a2f1e7b628a72956649 (diff) | |
| download | mariadb-git-69338e08c0ec776338806f810751e4a4923a96d6.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
extra/CMakeLists.txt:
Auto merged
extra/resolveip.c:
Auto merged
mysql-test/t/disabled.def:
Auto merged
Diffstat (limited to 'extra/resolveip.c')
| -rw-r--r-- | extra/resolveip.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/extra/resolveip.c b/extra/resolveip.c index e5fede7fda8..9f936fa60b4 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> |