[Freeswitch-svn] [commit] r2542 - in freeswitch/trunk/src: . include

[Freeswitch SVN]

Author: mikej
Date: Thu Sep  7 01:35:08 2006
New Revision: 2542

Modified:
   freeswitch/trunk/src/include/switch_core.h
   freeswitch/trunk/src/include/switch_ivr.h
   freeswitch/trunk/src/switch_core.c

Log:
update build on windows from latest core changes.

Modified: freeswitch/trunk/src/include/switch_core.h
==============================================================================
--- freeswitch/trunk/src/include/switch_core.h	(original)
+++ freeswitch/trunk/src/include/switch_core.h	Thu Sep  7 01:35:08 2006
@@ -119,7 +119,7 @@
   \param new pointer for the return value
   \return SWITCH_STATUS_SUCCESS if the operation was a success
 */
-SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t start, switch_port_t end, uint32_t inc, switch_core_port_allocator_t **new);
+SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t start, switch_port_t end, uint8_t inc, switch_core_port_allocator_t **new_allocator);
 
 /*!
   \brief Get a port from the port allocator

Modified: freeswitch/trunk/src/include/switch_ivr.h
==============================================================================
--- freeswitch/trunk/src/include/switch_ivr.h	(original)
+++ freeswitch/trunk/src/include/switch_ivr.h	Thu Sep  7 01:35:08 2006
@@ -42,7 +42,7 @@
 
 BEGIN_EXTERN_C
 
-static const switch_state_handler_table_t noop_state_handler = {};
+static const switch_state_handler_table_t noop_state_handler = {0};
 
 /**
  * @defgroup switch_ivr IVR Library

Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c	(original)
+++ freeswitch/trunk/src/switch_core.c	Thu Sep  7 01:35:08 2006
@@ -141,12 +141,12 @@
 	switch_port_t start;
 	switch_port_t end;
 	switch_port_t next;
-	uint32_t inc;
+	uint8_t inc;
 	switch_mutex_t *mutex;
 	switch_memory_pool_t *pool;
 };
 
-SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t start, switch_port_t end, uint32_t inc, switch_core_port_allocator_t **new)
+SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t start, switch_port_t end, uint8_t inc, switch_core_port_allocator_t **new_allocator)
 {
 	switch_status_t status;
 	switch_memory_pool_t *pool;
@@ -169,7 +169,7 @@
 	}
 	switch_mutex_init(&alloc->mutex, SWITCH_MUTEX_NESTED, pool);
 	alloc->pool = pool;
-	*new = alloc;
+	*new_allocator = alloc;
 
 	return SWITCH_STATUS_SUCCESS;
 }
@@ -180,7 +180,7 @@
 
 	switch_mutex_lock(alloc->mutex);
 	port = alloc->next;
-	alloc->next += alloc->inc;
+	alloc->next = alloc->next + alloc->inc;
 	if (alloc->next > alloc->end) {
 		alloc->next = alloc->start;
 	}