Author: mikej Date: Mon Aug 21 18:48:01 2006 New Revision: 2352 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: Windows build tweaks. Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Mon Aug 21 18:48:01 2006 @@ -451,8 +451,9 @@ size_t x; if (!apr_hash_get(handle->sub_hash, from, APR_HASH_KEY_STRING)) { + iks *msg; apr_hash_set(handle->sub_hash, apr_pstrdup(handle->pool, from), APR_HASH_KEY_STRING, &marker); - iks *msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, from, "Ding A Ling...."); + msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, from, "Ding A Ling...."); apr_queue_push(handle->queue, msg); } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Aug 21 18:48:01 2006 @@ -459,8 +459,7 @@ static int do_describe(struct private_object *tech_pvt, int force) { ldl_payload_t payloads[5]; - switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session); - assert(channel != NULL); + assert(switch_core_session_get_channel(tech_pvt->session) != NULL); if (switch_test_flag(tech_pvt, TFLAG_DO_DESC)) { return 1; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Aug 21 18:48:01 2006 @@ -1561,10 +1561,11 @@ struct fileio_obj *fio = JS_GetPrivate(cx, obj); if (fio) { - if (fio->fd) { + switch_memory_pool_t *pool; + if (fio->fd) { switch_file_close(fio->fd); } - switch_memory_pool_t *pool = fio->pool; + pool = fio->pool; switch_core_destroy_memory_pool(&pool); pool = NULL; }