fix windows build

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

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index c683df17b221d75ed92a03ea524b7f033928a2cf..636679578f4d7ed5e47b9814efc56ded8da1fa23 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -557,7 +557,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
                                                for (x = 0; x < imember->read / 2; x++) {
                                                        int32_t z = muxed[x] + bptr[x];
                                                        normalize_to_16bit(z);
-                                                       muxed[x] = z;
+                                                       muxed[x] = (int16_t)z;
                                                }
                                                
                                                ready++;

diff --git a/src/switch_core.c b/src/switch_core.c
index f77a8d72f058b166c0bbb27041bfddc6841e5c08..d0fd81ee39c00df6258709a400bf01b5401f2d4e 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -2870,9 +2870,9 @@ SWITCH_DECLARE(uint32_t) switch_core_session_limit(uint32_t new)
 
 SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err)
 {
+       switch_xml_t xml = NULL, cfg = NULL;
        memset(&runtime, 0, sizeof(runtime));
        runtime.session_limit = 1000;
-       switch_xml_t xml = NULL, cfg = NULL;
 
        switch_core_set_globals();
 

diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index da8fb9c9307e59287caa84c4e7c9849a0315aa3b..b6e3d88369b4cf2536de18bb9b0f2703fe2035ee 100644 (file)
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -668,7 +668,7 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_
         name = prefs[x];
         if ((p = strchr(name, '@'))) {
             p++;
-            len = p-name;
+            len = (uint32_t)(p-name);
 
             if (len > sizeof(buf)) {
                 len = sizeof(buf);
@@ -683,7 +683,7 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(const switch_codec_
                        for (imp = codec_interface->implementations; imp; imp = imp->next) {
                                if (!interval) {
                                        array[i++] = imp;
-                               } else if ((imp->microseconds_per_frame / 1000) == interval) {
+                               } else if ((uint32_t)(imp->microseconds_per_frame / 1000) == interval) {
                                        array[i++] = imp;
                                }
                        }