fix windows build.

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

diff --git a/src/include/switch_regex.h b/src/include/switch_regex.h
index aad80f3b65774fbbf8008284adbcfe9df8e882fa..e34a2f6559be940e811fe8938fd7435449661d04 100644 (file)
--- a/src/include/switch_regex.h
+++ b/src/include/switch_regex.h
@@ -51,7 +51,7 @@ SWITCH_DECLARE(void) switch_regex_free(void *data);
 
 SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen);
 SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data,
-                                                                                                char *substituted, uint32_t len, int *ovector);
+                                                                                                char *substituted, switch_size_t len, int *ovector);
 
 /*!
  \brief Function to evaluate an expression against a string

diff --git a/src/mod/applications/mod_limit/mod_limit.c b/src/mod/applications/mod_limit/mod_limit.c
index c694a2e7e20f89a1e0257f7eb2863315808e3af0..a745b73ba4bc68bcb55d936f8502aee8294a6f7f 100644 (file)
--- a/src/mod/applications/mod_limit/mod_limit.c
+++ b/src/mod/applications/mod_limit/mod_limit.c
@@ -471,10 +471,10 @@ SWITCH_STANDARD_API(group_api_function)
         goto done;
     } else if (!strcasecmp(argv[0], "call")) {
         char buf[4096] = "";
+        char *how = ",";
         callback_t cbt = { 0 };
         cbt.buf = buf;
         cbt.len = sizeof(buf);
-        char *how = ",";
         
         if (argc > 2) {
             if (!strcasecmp(argv[2], "order")) {

diff --git a/src/switch_channel.c b/src/switch_channel.c
index fde8d9bdf0beeb5f214ea89c5dc81f9fc4e67e0e..1467c953a641666161a300b97a404ed030f5f3b7 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1421,11 +1421,11 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
 
                                        if (offset >= 0) {
                                                sub_val += offset;
-                                       } else if (abs(offset) <= strlen(sub_val)) {
+                                       } else if ((size_t)abs(offset) <= strlen(sub_val)) {
                                                sub_val = cloned_sub_val + (strlen(cloned_sub_val) + offset);
                                        }
 
-                                       if (ooffset > 0 && ooffset < strlen(sub_val)) {
+                                       if (ooffset > 0 && (size_t)ooffset < strlen(sub_val)) {
                                                if ((p = (char *)sub_val + ooffset)) {
                                                        *p = '\0';
                                                }

diff --git a/src/switch_regex.c b/src/switch_regex.c
index c9df9f4b502c6fc1ca04700a1450a0c2c00b58cc..04bbe7d84c8f986bcfb57a4b42816ba2e0bea8fa 100644 (file)
--- a/src/switch_regex.c
+++ b/src/switch_regex.c
@@ -98,11 +98,12 @@ SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expressi
 
 
 SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data,
-                                                                                                char *substituted, uint32_t len, int *ovector)
+                                                                                                char *substituted, switch_size_t len, int *ovector)
 {
        char index[10] = "";
        char replace[1024] = "";
-       uint32_t x, y = 0, z = 0, num = 0;
+       switch_size_t x, y = 0, z = 0;
+       int num = 0;
 
        for (x = 0; x < (len - 1) && x < strlen(data);) {
                if (data[x] == '$') {
@@ -122,7 +123,7 @@ SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_c
                        num = atoi(index);
 
                        if (pcre_copy_substring(field_data, ovector, match_count, num, replace, sizeof(replace)) > 0) {
-                               unsigned int r;
+                               switch_size_t r;
                                for (r = 0; r < strlen(replace); r++) {
                                        substituted[y++] = replace[r];
                                }