mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-06 13:29:56 -05:00
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
6687dd0131
commit
a67c21f093
294 changed files with 79057 additions and 11614 deletions
|
|
@ -47,7 +47,7 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) {
|
|||
|
||||
switch (af) {
|
||||
case AF_INET:
|
||||
snprintf(dst, cnt, "%d.%d.%d.%d",
|
||||
pa_snprintf(dst, cnt, "%d.%d.%d.%d",
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
(int)(in->s_addr >> 24) & 0xff,
|
||||
(int)(in->s_addr >> 16) & 0xff,
|
||||
|
|
@ -61,7 +61,7 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) {
|
|||
#endif
|
||||
break;
|
||||
case AF_INET6:
|
||||
snprintf(dst, cnt, "%x:%x:%x:%x:%x:%x:%x:%x",
|
||||
pa_snprintf(dst, cnt, "%x:%x:%x:%x:%x:%x:%x:%x",
|
||||
in6->s6_addr[ 0] << 8 | in6->s6_addr[ 1],
|
||||
in6->s6_addr[ 2] << 8 | in6->s6_addr[ 3],
|
||||
in6->s6_addr[ 4] << 8 | in6->s6_addr[ 5],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue