]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
trivial fix build
authorJeff Lenk <jeff@jefflenk.com>
Mon, 21 Nov 2011 18:50:00 +0000 (12:50 -0600)
committerJeff Lenk <jeff@jefflenk.com>
Mon, 21 Nov 2011 18:50:00 +0000 (12:50 -0600)
src/mod/endpoints/mod_sofia/mod_sofia.c
src/switch_utils.c

index 5d18065141ddc5bae6116a4f88be94deaf80a232..7d37776f697c4c1c6b9aa7e8792b2668e52513f3 100644 (file)
@@ -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")) {
index 3baeefe7f5a7596f4d22c91289c0e71680d1113e..a523a1d218d784103a498012fdbfd9ed189c97f7 100644 (file)
@@ -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)) {