kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fri Jun 26 01:50:56 CDT 2009 kai.k.samposalo@nokia.com 

* Symbian build fix


git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14190 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-07-10 00:51:27 +00:00
parent ebbbc6da8c
commit 340bdda571
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Thu Jul 9 19:48:36 CDT 2009 Thu Jul 9 19:49:43 CDT 2009

5
libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c
View File

@ -421,19 +421,20 @@ gboolean su_source_check(GSource *gs)
SuSource *ss = (SuSource *)gs; SuSource *ss = (SuSource *)gs;
su_port_t *self = ss->ss_port; su_port_t *self = ss->ss_port;
gint tout; gint tout;
unsigned i, I; unsigned I;
enter; enter;
I = self->sup_n_waits; I = self->sup_n_waits;
#if SU_HAVE_POLL #if SU_HAVE_POLL
unsigned i;
for (i = 0; i < I; i++) { for (i = 0; i < I; i++) {
if (self->sup_waits[i].revents) if (self->sup_waits[i].revents)
return TRUE; return TRUE;
} }
#endif #endif
(void)I;
return su_source_prepare(gs, &tout); return su_source_prepare(gs, &tout);
} }

8
libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c
View File

@ -223,8 +223,12 @@ sres_cache_get0(sres_htable_t *htable,
if (cname && dcount == derrorcount) { if (cname && dcount == derrorcount) {
/* Nothing found, trace CNAMEs */ /* Nothing found, trace CNAMEs */
struct frame *f, frame = { previous, domain }; unsigned hash;
unsigned hash = sres_hash_key(domain = cname->cn_cname); struct frame *f, frame;
frame.previous = previous;
frame.domain = domain;
hash = sres_hash_key(domain = cname->cn_cname);
/* Check for cname loops */ /* Check for cname loops */
for (f = previous; f; f = f->previous) { for (f = previous; f; f = f->previous) {

9
libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c
View File

@ -34,7 +34,8 @@
* *
* @author Pekka Pessi <Pekka.Pessi@nokia.com> * @author Pekka Pessi <Pekka.Pessi@nokia.com>
*/ */
#include <stdlib.h>
#include <sofia-sip/su_config.h>
#include "config.h" #include "config.h"
#include <sofia-sip/heap.h> #include <sofia-sip/heap.h>
@ -219,7 +220,11 @@ void su_smoothsort(void *base, size_t r, size_t N,
stretch s = { 1, 1, 1 }; stretch s = { 1, 1, 1 };
size_t q; size_t q;
array const array[1] = {{ base, less, swap }}; array array_i;
array* const array = &array_i;
array->less = less;
array->swap = swap;
array->m = base;
assert(less && swap); assert(less && swap);

4
libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp
View File

@ -68,6 +68,9 @@ SOURCE strtoull.c
SOURCE su_string.c SOURCE su_string.c
SOURCE getopt.c SOURCE getopt.c
SOURCE poll.c SOURCE poll.c
SOURCE smoothsort.c
SOURCE su_kqueue_port.c
SOURCE su_devpoll_port.c
SOURCEPATH ..\..\libsofia-sip-ua\bnf SOURCEPATH ..\..\libsofia-sip-ua\bnf
@ -286,7 +289,6 @@ SYSTEMINCLUDE \epoc32\include\stdapis
SYSTEMINCLUDE \epoc32\include\stdapis\openssl SYSTEMINCLUDE \epoc32\include\stdapis\openssl
SYSTEMINCLUDE \epoc32\include\osextensions SYSTEMINCLUDE \epoc32\include\osextensions
SYSTEMINCLUDE \epoc32\include\osextensions\sofia-sip SYSTEMINCLUDE \epoc32\include\osextensions\sofia-sip
SYSTEMINCLUDE \epoc32\include\stdapis\stlport
// Library dependencies // Library dependencies