Commit 41563607 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

moved the *_inet_pton protos to inet_net_pton.h instead

parent 2d4dcfb7

ares/Makefile.inc

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ ares_gethostbyaddr.c ares_send.c ares__read_line.c ares_gethostbyname.c \ 
ares_strerror.c ares_cancel.c ares_init.c ares_timeout.c ares_destroy.c	   \

ares_mkquery.c ares_version.c ares_expand_name.c ares_parse_a_reply.c	   \

windows_port.c ares_expand_string.c ares_parse_ptr_reply.c                 \

ares_parse_aaaa_reply.c inet_net_pton.c

ares_parse_aaaa_reply.c inet_net_pton.c inet_net_pton.h



HHEADERS = ares.h ares_private.h setup.h ares_dns.h ares_version.h nameser.h

ares/inet_net_pton.c

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
#include <string.h>

#include <stdlib.h>



#include "inet_net_pton.h"



#if !defined(HAVE_INET_NET_PTON) || !defined(HAVE_INET_NET_PTON_IPV6) || \

    !defined(HAVE_INET_PTON) || !defined(HAVE_INET_PTON_IPV6)

ares/inet_net_pton.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/* $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 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

int ares_inet_pton(int af, const char *src, void *dst);

#endif

#if defined(HAVE_INET_NET_PTON) && defined(HAVE_INET_NET_PTON_IPV6)

#define ares_inet_net_pton(w,x,y,z) inet_net_pton(w,x,y,z)

#else

int ares_inet_net_pton(int af, const char *src, void *dst, size_t size);

#endif



#endif /* INET_NET_PTON_H */

ares/setup.h

+0 −22
Original line number Diff line number Diff line
@@ -78,26 +78,4 @@ int ares_strcasecmp(const char *s1, const char *s2); 
#endif

#endif



#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

int ares_inet_pton(int af, const char *src, void *dst);

#endif

#if defined(HAVE_INET_NET_PTON) && defined(HAVE_INET_NET_PTON_IPV6)

#define ares_inet_net_pton(w,x,y,z) inet_net_pton(w,x,y,z)

#else

int ares_inet_net_pton(int af, const char *src, void *dst, size_t size);

#endif



#endif /* ARES_SETUP_H */