fix for msvc 9 build.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6630 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-12-11 10:10:03 +00:00
parent d6134a63c8
commit 5c19d7f5d1
4 changed files with 11 additions and 5 deletions

View File

@ -69,7 +69,7 @@ static int inet_pton6(const char *src, unsigned char *dst);
* Paul Vixie, 1996.
*/
int
inet_pton(int af, const char *src, void *dst)
udns_inet_pton(int af, const char *src, void *dst)
{
switch (af) {
case AF_INET:

View File

@ -23,6 +23,6 @@
* $Id: inet_pton.h,v 1.7 2005/11/28 20:21:36 bagder Exp $
***************************************************************************/
int inet_pton(int, const char *, void *);
int udns_inet_pton(int, const char *, void *);
#endif /* __INET_PTON_H */

View File

@ -34,8 +34,10 @@
#define _CRT_NONSTDC_NO_DEPRECATE
#endif
#endif // VC8+
#include "inet_pton.h"
int udns_inet_pton(int, const char *, void *);
#include "process.h"
#else
#define udns_inet_pton inet_pton
#endif
# include <winsock2.h> /* includes <windows.h> */
# include <ws2tcpip.h> /* needed for struct in6_addr */
@ -282,12 +284,12 @@ static int dns_add_serv_internal(struct dns_ctx *ctx, const char *serv) {
#if HAVE_INET6
{ struct in_addr addr;
struct in6_addr addr6;
if (inet_pton(AF_INET, serv, &addr) > 0) {
if (udns_inet_pton(AF_INET, serv, &addr) > 0) {
sns->sin.sin_family = AF_INET;
sns->sin.sin_addr = addr;
return ++ctx->dnsc_nserv;
}
if (inet_pton(AF_INET6, serv, &addr6) > 0) {
if (udns_inet_pton(AF_INET6, serv, &addr6) > 0) {
sns->sin6.sin6_family = AF_INET6;
sns->sin6.sin6_addr = addr6;
return ++ctx->dnsc_nserv;

View File

@ -209,6 +209,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\..\udns\inet_pton.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"