1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 07:38:49 -05:00

Attempted to fix c-ares not building on non-IPv6 systems

This commit is contained in:
Dominick Meglio 2005-04-15 15:25:16 +00:00
parent c2fcdf3a02
commit 099ae31523
3 changed files with 45 additions and 23 deletions

43
ares/ares_ipv6.h Normal file
View File

@ -0,0 +1,43 @@
/* $Id$ */
/*
* Permission to use, copy, modify, and distribute this
* software and its documentation for any purpose and without
* fee is hereby granted, provided that the above copyright
* notice appear in all copies and that both that copyright
* notice and this permission notice appear in supporting
* documentation, and that the name of M.I.T. not be used in
* advertising or publicity pertaining to distribution of the
* software without specific, written prior permission.
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*/
#ifndef ARES_IPV6_H
#define ARES_IPV6_H
#ifndef HAVE_PF_INET6
#define PF_INET6 AF_INET6
#endif
#ifndef HAVE_STRUCT_IN6_ADDR
struct in6_addr
{
unsigned char s6_addr[16];
};
#endif
#ifndef NS_IN6ADDRSZ
#define NS_IN6ADDRSZ SIZEOF_STRUCT_IN6_ADDR
#endif
#ifndef NS_INADDRSZ
#define NS_INADDRSZ SIZEOF_STRUCT_IN_ADDR
#endif
#ifndef NS_INT16SZ
#define NS_INT16SZ 2
#endif
#endif /* ARES_IPV6_H */

View File

@ -69,6 +69,8 @@
#endif
#include "ares_ipv6.h"
struct send_request {
/* Remaining data to send */
const unsigned char *data;

View File

@ -17,17 +17,6 @@
#ifndef INET_NET_PTON_H
#define INET_NET_PTON_H
#ifndef HAVE_PF_INET6
#define PF_INET6 AF_INET6
#endif
#ifndef HAVE_STRUCT_IN6_ADDR
struct in6_addr
{
unsigned char s6_addr[16];
};
#endif
#if defined(HAVE_INET_PTON) && defined(HAVE_INET_PTON_IPV6)
#define ares_inet_pton(x,y,z) inet_pton(x,y,z)
#else
@ -39,16 +28,4 @@ int ares_inet_pton(int af, const char *src, void *dst);
int ares_inet_net_pton(int af, const char *src, void *dst, size_t size);
#endif
#ifndef NS_IN6ADDRSZ
#define NS_IN6ADDRSZ SIZEOF_STRUCT_IN6_ADDR
#endif
#ifndef NS_INADDRSZ
#define NS_INADDRSZ SIZEOF_STRUCT_IN_ADDR
#endif
#ifndef NS_INT16SZ
#define NS_INT16SZ 2
#endif
#endif /* INET_NET_PTON_H */