diff options
| author | unknown <joerg@trift2.> | 2008-01-28 15:05:33 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2008-01-28 15:05:33 +0100 |
| commit | 81ac291104729e0f5ea46950f3a98a9f1f3281ac (patch) | |
| tree | f7629104e65a749edc2f168d585a94877b570be4 /extra/resolveip.c | |
| parent | 32f59206764a448e1adf06e72ed69f7b4a907ce3 (diff) | |
| parent | e09b41cf579d6bff2ac1652871fbbbdf47ebfd98 (diff) | |
| download | mariadb-git-81ac291104729e0f5ea46950f3a98a9f1f3281ac.tar.gz | |
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0
configure.in:
Auto merged
extra/resolveip.c:
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 c613f6a8cb6..0cc89d6e22e 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> |