kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 09:12:25 +00:00
Code Issues Projects Releases Wiki Activity

fix for msvc 9 build.

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6628 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-12-11 10:01:55 +00:00
parent 2a72aea08b
commit a8a5e462ec
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/switch.h
View File

@ -71,7 +71,10 @@
#include <setjmp.h> #include <setjmp.h>
#include <ctype.h> #include <ctype.h>
#include <fcntl.h> #include <fcntl.h>
#ifndef _MSC_VER #ifdef _MSC_VER
#include <Winsock2.h>
#include <Ws2tcpip.h>
#else
#include <strings.h> #include <strings.h>
#endif #endif
#include <string.h> #include <string.h>

20
src/switch_utils.c
View File

@ -742,7 +742,9 @@ SWITCH_DECLARE(const char *) switch_priority_name(switch_priority_t priority)
static char RFC2833_CHARS[] = "0123456789*#ABCDF"; static char RFC2833_CHARS[] = "0123456789*#ABCDF";
#ifdef _MSC_VER #ifndef _MSC_VER
#define switch_inet_ntop inet_ntop
#else
/* Copyright (c) 1996 by Internet Software Consortium. /* Copyright (c) 1996 by Internet Software Consortium.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -772,9 +774,9 @@ static char RFC2833_CHARS[] = "0123456789*#ABCDF";
* sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
*/ */
static const char *inet_ntop4(const unsigned char *src, char *dst, size_t size); static const char *switch_inet_ntop4(const unsigned char *src, char *dst, size_t size);
#if HAVE_SIN6 #if HAVE_SIN6
static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size); static const char *switch_inet_ntop6(const unsigned char *src, char *dst, size_t size);
#endif #endif
/* char * /* char *
@ -786,15 +788,15 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size);
* Paul Vixie, 1996. * Paul Vixie, 1996.
*/ */
const char * const char *
inet_ntop(int af, void const *src, char *dst, size_t size) switch_inet_ntop(int af, void const *src, char *dst, size_t size)
{ {
switch (af) { switch (af) {
case AF_INET: case AF_INET:
return inet_ntop4(src, dst, size); return switch_inet_ntop4(src, dst, size);
#if HAVE_SIN6 #if HAVE_SIN6
case AF_INET6: case AF_INET6:
return inet_ntop6(src, dst, size); return switch_inet_ntop6(src, dst, size);
#endif #endif
default: default:
return NULL; return NULL;
@ -814,7 +816,7 @@ inet_ntop(int af, void const *src, char *dst, size_t size)
* Paul Vixie, 1996. * Paul Vixie, 1996.
*/ */
static const char * static const char *
inet_ntop4(const unsigned char *src, char *dst, size_t size) switch_inet_ntop4(const unsigned char *src, char *dst, size_t size)
{ {
static const char fmt[] = "%u.%u.%u.%u"; static const char fmt[] = "%u.%u.%u.%u";
char tmp[sizeof "255.255.255.255"]; char tmp[sizeof "255.255.255.255"];
@ -835,7 +837,7 @@ inet_ntop4(const unsigned char *src, char *dst, size_t size)
* Paul Vixie, 1996. * Paul Vixie, 1996.
*/ */
static const char * static const char *
inet_ntop6(unsigned char const *src, char *dst, size_t size) switch_inet_ntop6(unsigned char const *src, char *dst, size_t size)
{ {
/* /*
* Note that int32_t and int16_t need only be "at least" large enough * Note that int32_t and int16_t need only be "at least" large enough
@ -927,7 +929,7 @@ SWITCH_DECLARE(char *) get_addr(char *buf, switch_size_t len, struct in_addr *in
assert(buf); assert(buf);
*buf = '\0'; *buf = '\0';
if (in) { if (in) {
inet_ntop(AF_INET, in, buf, len); switch_inet_ntop(AF_INET, in, buf, len);
} }
return buf; return buf;
} }