Diff
Modified: freeswitch/trunk/libs/sofia-sip/.update (14189 => 14190)
--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:50:12 UTC (rev 14189)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:51:27 UTC (rev 14190)
@@ -1 +1 @@
-Thu Jul 9 19:48:36 CDT 2009
+Thu Jul 9 19:49:43 CDT 2009
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c (14189 => 14190)
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c 2009-07-10 00:50:12 UTC (rev 14189)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c 2009-07-10 00:51:27 UTC (rev 14190)
@@ -223,9 +223,13 @@
if (cname && dcount == derrorcount) {
/* Nothing found, trace CNAMEs */
- struct frame *f, frame = { previous, domain };
- unsigned hash = sres_hash_key(domain = cname->cn_cname);
+ unsigned hash;
+ struct frame *f, frame;
+ frame.previous = previous;
+ frame.domain = domain;
+ hash = sres_hash_key(domain = cname->cn_cname);
+
/* Check for cname loops */
for (f = previous; f; f = f->previous) {
if (su_casematch(domain, f->domain))
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c (14189 => 14190)
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c 2009-07-10 00:50:12 UTC (rev 14189)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c 2009-07-10 00:51:27 UTC (rev 14190)
@@ -34,7 +34,8 @@
*
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
*/
-
+#include <stdlib.h>
+#include <sofia-sip/su_config.h>
#include "config.h"
#include <sofia-sip/heap.h>
@@ -219,7 +220,11 @@
stretch s = { 1, 1, 1 };
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);
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c (14189 => 14190)
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c 2009-07-10 00:50:12 UTC (rev 14189)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c 2009-07-10 00:51:27 UTC (rev 14190)
@@ -421,19 +421,20 @@
SuSource *ss = (SuSource *)gs;
su_port_t *self = ss->ss_port;
gint tout;
- unsigned i, I;
+ unsigned I;
enter;
I = self->sup_n_waits;
#if SU_HAVE_POLL
+ unsigned i;
for (i = 0; i < I; i++) {
if (self->sup_waits[i].revents)
return TRUE;
}
#endif
-
+ (void)I;
return su_source_prepare(gs, &tout);
}
Modified: freeswitch/trunk/libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp (14189 => 14190)
--- freeswitch/trunk/libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp 2009-07-10 00:50:12 UTC (rev 14189)
+++ freeswitch/trunk/libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp 2009-07-10 00:51:27 UTC (rev 14190)
@@ -68,6 +68,9 @@
SOURCE su_string.c
SOURCE getopt.c
SOURCE poll.c
+SOURCE smoothsort.c
+SOURCE su_kqueue_port.c
+SOURCE su_devpoll_port.c
SOURCEPATH ..\..\libsofia-sip-ua\bnf
@@ -286,7 +289,6 @@
SYSTEMINCLUDE \epoc32\include\stdapis\openssl
SYSTEMINCLUDE \epoc32\include\osextensions
SYSTEMINCLUDE \epoc32\include\osextensions\sofia-sip
-SYSTEMINCLUDE \epoc32\include\stdapis\stlport
// Library dependencies