Windows build tweaks.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2352 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/libdingaling/src/libdingaling.c b/libs/libdingaling/src/libdingaling.c
index 3b5fb39c1a818dde49d8fdf4b9244314c295583b..b0706919d288c8892665b7cddbacd089c3677d37 100644 (file)
--- 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 318b2a5b31805a36277a7e188ece1f0bd4289725..8d94bb93efee006f7a235d993a06680c8291aba1 100644 (file)
--- 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 d41f49dbc96d6fab3ed14d6b38154652041305ff..292208dae9e058c8fcadf8c8aadb38c9634ab4fa 100644 (file)
--- 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;
        }