[Freeswitch-svn] [commit] r1833 - in freeswitch/trunk/src: . mod/applications/mod_conference

[Freeswitch SVN]

Author: mikej
Date: Tue Jul 11 16:59:07 2006
New Revision: 1833

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
   freeswitch/trunk/src/switch_core.c
   freeswitch/trunk/src/switch_loadable_module.c

Log:
fix windows build

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Tue Jul 11 16:59:07 2006
@@ -557,7 +557,7 @@
 						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++;

Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c	(original)
+++ freeswitch/trunk/src/switch_core.c	Tue Jul 11 16:59:07 2006
@@ -2870,9 +2870,9 @@
 
 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();
 

Modified: freeswitch/trunk/src/switch_loadable_module.c
==============================================================================
--- freeswitch/trunk/src/switch_loadable_module.c	(original)
+++ freeswitch/trunk/src/switch_loadable_module.c	Tue Jul 11 16:59:07 2006
@@ -668,7 +668,7 @@
         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 @@
 			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;
 				}
 			}