From 442f4d2522ead401b8fa05be3a609cfbf3b22f1a Mon Sep 17 00:00:00 2001
From: Marc Olivier Chouinard <mochouinard@moctel.com>
Date: Fri, 16 Dec 2011 07:35:05 -0500
Subject: [PATCH] FS-3766 --resolve

---
 libs/esl/src/esl.c                                 | 5 +++++
 libs/pcre/pcre_ucp_searchfuncs.c                   | 6 +++---
 src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj  | 4 ----
 src/mod/endpoints/mod_sofia/mod_sofia.2010.vcxproj | 1 -
 src/switch_rtp.c                                   | 7 ++++---
 src/switch_xml.c                                   | 2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/libs/esl/src/esl.c b/libs/esl/src/esl.c
index 18d7408c6e..5159166ce9 100644
--- 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 a9df1f0d31..83ee7ff5a6 100644
--- 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 e6490f13dd..616ebd87a4 100644
--- 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"
 			>
 		</File>
-		<File
-			RelativePath=".\sofia_sla.c"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.2010.vcxproj b/src/mod/endpoints/mod_sofia/mod_sofia.2010.vcxproj
index ab53d06524..736cea580b 100644
--- 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" />
     <ClCompile Include="sofia_presence.c" />
     <ClCompile Include="sofia_reg.c" />
-    <ClCompile Include="sofia_sla.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="mod_sofia.h" />
diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index cac5c8f45c..27d06dce0b 100644
--- 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 7e717846ef..d9b28a312f 100644
--- 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);