From 14d79cf500cb1d792d6d54264c477804ce514012 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 21 Aug 2006 22:48:01 +0000 Subject: [PATCH] Windows build tweaks. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2352 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/libdingaling/src/libdingaling.c | 3 ++- src/mod/endpoints/mod_dingaling/mod_dingaling.c | 3 +-- src/mod/languages/mod_spidermonkey/mod_spidermonkey.c | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/libdingaling/src/libdingaling.c b/libs/libdingaling/src/libdingaling.c index 3b5fb39c1a..b0706919d2 100644 --- a/libs/libdingaling/src/libdingaling.c +++ b/libs/libdingaling/src/libdingaling.c @@ -451,8 +451,9 @@ static int on_presence(void *user_data, ikspak *pak) 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); } diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c index 318b2a5b31..8d94bb93ef 100644 --- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c +++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c @@ -459,8 +459,7 @@ static char *lame(char *in) 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; diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c index d41f49dbc9..292208dae9 100644 --- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c +++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c @@ -1561,10 +1561,11 @@ static void fileio_destroy(JSContext *cx, JSObject *obj) 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; }