fix windows build

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

diff --git a/src/include/switch_console.h b/src/include/switch_console.h
index 7725a120503d6f9f11f265ed2c3d4e6556924de8..2a7e54dbb77d3418f4de954eb7c38b7c58214db7 100644 (file)
--- a/src/include/switch_console.h
+++ b/src/include/switch_console.h
@@ -64,12 +64,13 @@ SWITCH_DECLARE(void) switch_console_loop(void);
 SWITCH_DECLARE(void) switch_console_printf(switch_text_channel_t channel, const char *file, const char *func, int line,
                                                                                   const char *fmt, ...) PRINTF_FUNCTION(5, 6);
 
-SWITCH_DECLARE(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen);
+SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen);
 
 /*!
   \brief A method akin to printf for dealing with api streams
 */
-SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) PRINTF_FUNCTION(2, 3);
+SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) PRINTF_FUNCTION(2, 3);
+
 SWITCH_END_EXTERN_C
 #endif
 /* For Emacs:

diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 528aff9e35f3c3e356211d036091f2d51c39fbff..cdea67b88906d197ba410ba4ef62a96348680126 100644 (file)
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -70,7 +70,7 @@ static inline switch_bool_t switch_is_digit_string(const char *s) {
        return SWITCH_TRUE;
 }
 
-switch_size_t switch_fd_read_line(int fd, char *buf, switch_size_t len);
+SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len);
 
 /*!
   \brief Evaluate the truthfullness of a string expression

diff --git a/src/mod/applications/mod_voicemail/mod_voicemail.c b/src/mod/applications/mod_voicemail/mod_voicemail.c
index eb3ed2bdb3dc58edfd61425461de5e6a1e24feb4..2d492952bf7fa771dbb0a233df6b42712be06b43 100644 (file)
--- a/src/mod/applications/mod_voicemail/mod_voicemail.c
+++ b/src/mod/applications/mod_voicemail/mod_voicemail.c
@@ -2494,7 +2494,9 @@ SWITCH_STANDARD_API(voicemail_api_function)
         for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
             switch_hash_this(hi, NULL, NULL, &val);
             profile = (vm_profile_t *) val;
-            break;
+                       if (profile) {
+                   break;
+                       }
         }
     }
 

diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
index 9eea40771f1f9399a0bcbab796014cf045ec17d6..5c54bcc3b6c67966cdb2bb214785e85cd77d8ad0 100644 (file)
--- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
+++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
@@ -552,9 +552,9 @@ abyss_bool handler_hook(TSession * r)
 
        for (i=0;i<r->response_headers.size;i++) {
                ti=&r->response_headers.item[i];
-               ConnWrite(r->conn,ti->name,strlen(ti->name));
+               ConnWrite(r->conn, ti->name, (uint32_t)strlen(ti->name));
                ConnWrite(r->conn,": ",2);
-               ConnWrite(r->conn,ti->value,strlen(ti->value));
+               ConnWrite(r->conn, ti->value, (uint32_t)strlen(ti->value));
                ConnWrite(r->conn,CRLF,2);
        }
 

diff --git a/src/switch_console.c b/src/switch_console.c
index c03b5bc8c734fcfa76290d49b60bbed1c2b1aede..a2f4ac8e578baacdd4d9f17d19f20dcca7463a56 100644 (file)
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -34,7 +34,7 @@
 #include <switch_version.h>
 #define CMD_BUFLEN 1024;
 
-SWITCH_DECLARE(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen)
+SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen)
 {
        FILE *out = switch_core_get_console();
 
@@ -46,7 +46,7 @@ SWITCH_DECLARE(switch_status_t) switch_console_stream_raw_write(switch_stream_ha
        return SWITCH_STATUS_FALSE;
 }
 
-SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...)
+SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...)
 {
        va_list ap;
        char *buf = handle->data;

diff --git a/src/switch_utils.c b/src/switch_utils.c
index 9df0dcc15bc2f9910384be0e77b8f05421b8266b..69bf362e6797b41b9319cc40efe88608b4013384 100644 (file)
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -36,7 +36,7 @@
 #include "private/switch_core_pvt.h"
 
 
-switch_size_t switch_fd_read_line(int fd, char *buf, switch_size_t len)
+SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len)
 {
        char c, *p;
        int cur;
@@ -104,7 +104,7 @@ SWITCH_DECLARE(switch_status_t) switch_b64_decode(char *in, char *out, switch_si
        }
 
        for (i=0; i<64; i++) {
-               l64[(int)switch_b64_table[i]] = i;
+               l64[(int)switch_b64_table[i]] = (char)i;
        }
 
        for (ip = in; ip && *ip; ip++) {
@@ -117,7 +117,7 @@ SWITCH_DECLARE(switch_status_t) switch_b64_decode(char *in, char *out, switch_si
                l += 6;
 
                while (l >= 8) {
-                       op[ol++] = (b >> (l -= 8)) % 256;
+                       op[ol++] = (char)((b >> (l -= 8)) % 256);
                        if (ol >= olen -2) {
                                goto end;
                        }