From: Jeff Lenk <jeff@jefflenk.com>
Date: Mon, 21 Nov 2011 18:50:00 +0000 (-0600)
Subject: trivial fix build
X-Git-Tag: v1.2-rc1~27^2~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=422df6180fd0d4c61afb9229f0c2f96b3f7afbb1;p=thirdparty%2Ffreeswitch.git

trivial fix build
---

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 5d18065141..7d37776f69 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1905,9 +1905,8 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 
 	case SWITCH_MESSAGE_INDICATE_PHONE_EVENT:
 		{
-
-			switch_channel_set_flag(channel, CF_REQ_MEDIA);
 			const char *event = "talk";
+			switch_channel_set_flag(channel, CF_REQ_MEDIA);
 
 			if (!zstr(msg->string_arg) && strcasecmp(msg->string_arg, event)) {
 				if (!strcasecmp(msg->string_arg, "hold")) {
diff --git a/src/switch_utils.c b/src/switch_utils.c
index 3baeefe7f5..a523a1d218 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -2894,7 +2894,7 @@ SWITCH_DECLARE(char *) switch_format_number(const char *num)
 	const char *p = num;
 
 	if (!p) {
-		return p;
+		return (char*)p;
 	}
 
 	if (zstr(p)) {