update build on windows from latest core changes.

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

diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index f2d027eb3554ed8e990e714b3280d284f05a7a89..7335d7f7e8bfefa0591a68f22f39a810d2ca0c3b 100644 (file)
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -119,7 +119,7 @@ struct switch_core_port_allocator;
   \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

diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h
index a9ff01cd232e2773d304afc8d47058cfaf18f9f6..af215fa6f4d0cce55fa2c0695d7d48c506fa2515 100644 (file)
--- a/src/include/switch_ivr.h
+++ b/src/include/switch_ivr.h
@@ -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

diff --git a/src/switch_core.c b/src/switch_core.c
index 06f2b0e4067fc2ae99540da2036870bff4f420b0..86d79ba7044df86c2434eaf0c462fcb652af0a01 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -141,12 +141,12 @@ struct switch_core_port_allocator {
        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_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t sta
        }
        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_DECLARE(switch_port_t) switch_core_port_allocator_request_port(switch_cor
 
        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;
        }