FS-3766 --resolve

diff --git a/libs/esl/src/esl.c b/libs/esl/src/esl.c
index 18d7408c6edb9ea40f3a514b9d6580dfe7f9b251..5159166ce9391f0d43959aeb6b01193480bf09a9 100644 (file)
--- a/libs/esl/src/esl.c
+++ b/libs/esl/src/esl.c
@@ -59,7 +59,12 @@
 /* These warnings need to be ignored warning in sdk header */
 #include <Ws2tcpip.h>
 #include <windows.h>
+#ifndef errno
 #define errno WSAGetLastError()
+#endif
+#ifndef EINTR
+#define EINTR WSAEINTR
+#endif
 #pragma warning (default:6386)
 #endif
 

diff --git a/libs/pcre/pcre_ucp_searchfuncs.c b/libs/pcre/pcre_ucp_searchfuncs.c
index a9df1f0d319bc64300bc21d8079ae8c86cd303be..83ee7ff5a64ee3902a2c23aba829af96ee14cdf9 100644 (file)
--- a/libs/pcre/pcre_ucp_searchfuncs.c
+++ b/libs/pcre/pcre_ucp_searchfuncs.c
@@ -155,12 +155,12 @@ for (;;)
   if (top <= bot) return -1;
   mid = (bot + top) >> 1;
   if (c == (ucp_table[mid].f0 & f0_charmask)) break;
-  if (c < (ucp_table[mid].f0 & f0_charmask)) top = mid;
+  if (c < (int)(ucp_table[mid].f0 & f0_charmask)) top = mid;
   else
     {
     if ((ucp_table[mid].f0 & f0_rangeflag) != 0 &&
-        c <= (ucp_table[mid].f0 & f0_charmask) +
-             (ucp_table[mid].f1 & f1_rangemask)) break;
+        c <= (int)((ucp_table[mid].f0 & f0_charmask) +
+             (ucp_table[mid].f1 & f1_rangemask))) break;
     bot = mid + 1;
     }
   }

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj b/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj
index e6490f13ddf000fda69d3aaf834be3aefe05b627..616ebd87a41528f98cc2f8d33b8c15ce6ffeeb4c 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj
@@ -321,10 +321,6 @@
                        RelativePath=".\sofia_reg.c"\r
                        >\r
                </File>\r
-               <File\r
-                       RelativePath=".\sofia_sla.c"\r
-                       >\r
-               </File>\r
        </Files>\r
        <Globals>\r
        </Globals>\r

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.2010.vcxproj b/src/mod/endpoints/mod_sofia/mod_sofia.2010.vcxproj
index ab53d065244aa740a89db749393b03437619da98..736cea580b002d358dcd3809a1d90aeb879adb1b 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.2010.vcxproj
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.2010.vcxproj
@@ -143,7 +143,6 @@
     <ClCompile Include="sofia_glue.c" />\r
     <ClCompile Include="sofia_presence.c" />\r
     <ClCompile Include="sofia_reg.c" />\r
-    <ClCompile Include="sofia_sla.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="mod_sofia.h" />\r

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index cac5c8f45cfa8b126efb828458d688548b406ecd..27d06dce0b9810c197f92dbc2b16af8aad9ffd61 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -3497,6 +3497,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtcp_zerocopy_read_frame(switch_rtp_t *rt
                unsigned packet_length = (ntohs((uint16_t) rtp_session->rtcp_recv_msg.header.length) + 1) * 4 - sizeof(switch_rtcp_hdr_t);
                unsigned int reportsOffset = sizeof(struct switch_rtcp_senderinfo);
                int i = 0;
+               unsigned int offset;
 
                /* turn the flag off! */
                rtp_session->rtcp_fresh_frame = 0;
@@ -3509,10 +3510,10 @@ SWITCH_DECLARE(switch_status_t) switch_rtcp_zerocopy_read_frame(switch_rtp_t *rt
                frame->packet_count =  ntohl(sr->pc);
                frame->octect_count = ntohl(sr->oc);
 
-               for (int offset = reportsOffset; offset < packet_length; offset += sizeof(struct switch_rtcp_report_block)) {
+               for (offset = reportsOffset; offset < packet_length; offset += sizeof(struct switch_rtcp_report_block)) {
                        struct switch_rtcp_report_block* report = (struct switch_rtcp_report_block*) (rtp_session->rtcp_recv_msg.body + offset);
                        frame->reports[i].ssrc = ntohl(report->ssrc);
-                       frame->reports[i].fraction = ntohl(report->fraction);
+                       frame->reports[i].fraction = (uint8_t)ntohl(report->fraction);
                        frame->reports[i].lost = ntohl(report->lost);
                        frame->reports[i].highest_sequence_number_received = ntohl(report->highest_sequence_number_received);
                        frame->reports[i].jitter = ntohl(report->jitter);
@@ -3523,7 +3524,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtcp_zerocopy_read_frame(switch_rtp_t *rt
                                break;
                        }
                }
-               frame->report_count = i;
+               frame->report_count = (uint16_t)i;
 
                return SWITCH_STATUS_SUCCESS;
        }

diff --git a/src/switch_xml.c b/src/switch_xml.c
index 7e717846ef4076c1183b2892c1ab42570cce9a3d..d9b28a312f379deff03a41f4626b711589d0c88a 100644 (file)
--- a/src/switch_xml.c
+++ b/src/switch_xml.c
@@ -102,7 +102,7 @@ void globfree(glob_t *);
 #define SWITCH_XML_ERRL 128            /* maximum error string length */
 
 /* Use UTF-8 as the general encoding */
-#define USE_UTF_8_ENCODING SWITCH_TRUE
+static switch_bool_t USE_UTF_8_ENCODING = SWITCH_TRUE;
 
 static int preprocess(const char *cwd, const char *file, int write_fd, int rlevel);