Ok, done and fixed, thank you very much :)<br><br><div class="gmail_quote">2009/8/12 Milena <span dir="ltr"><<a href="mailto:testeador01@gmail.com">testeador01@gmail.com</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
It's modified because it wouldn't compile with those "<<<<<<" at the end of the file<br><br><div class="gmail_quote">2009/8/12 Michael Jerris <span dir="ltr"><<a href="mailto:mike@jerris.com" target="_blank">mike@jerris.com</a>></span><div>
<div></div><div class="h5"><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The M in the version number means modified. You had local code<br>
changes that conflicted when you updated trunk. Revert the changes to<br>
that file and it should be fine.<br>
<br>
Mike<br>
<div><div></div><div><br>
On Aug 12, 2009, at 10:59 AM, Milena <<a href="mailto:testeador01@gmail.com" target="_blank">testeador01@gmail.com</a>> wrote:<br>
<br>
> I just did a rebootstrap on a fs box, it turned out the new revision<br>
> has this at the end of mod_sofia.h:<br>
><br>
> char *sofia_glue_get_extra_headers(switch_channel_t *channel, const<br>
> char *prefix);<br>
> <<<<<<< .mine<br>
> void sofia_glue_set_extra_headers(switch_channel_t *channel, sip_t<br>
> const *sip, const char *prefix);<br>
><br>
> =======<br>
> void sofia_glue_set_extra_headers(switch_channel_t *channel, sip_t<br>
> const *sip, const char *prefix);<br>
> >>>>>>> .r14490<br>
><br>
> no wonder why it wouldn't compile :P<br>
><br>
><br>
</div></div><div><div></div><div>> _______________________________________________<br>
> FreeSWITCH-users mailing list<br>
> <a href="mailto:FreeSWITCH-users@lists.freeswitch.org" target="_blank">FreeSWITCH-users@lists.freeswitch.org</a><br>
> <a href="http://lists.freeswitch.org/mailman/listinfo/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/listinfo/freeswitch-users</a><br>
> UNSUBSCRIBE:<a href="http://lists.freeswitch.org/mailman/options/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/options/freeswitch-users</a><br>
> <a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br>
<br>
_______________________________________________<br>
FreeSWITCH-users mailing list<br>
<a href="mailto:FreeSWITCH-users@lists.freeswitch.org" target="_blank">FreeSWITCH-users@lists.freeswitch.org</a><br>
<a href="http://lists.freeswitch.org/mailman/listinfo/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/listinfo/freeswitch-users</a><br>
UNSUBSCRIBE:<a href="http://lists.freeswitch.org/mailman/options/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/options/freeswitch-users</a><br>
<a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br>
</div></div></blockquote></div></div></div><br>
</blockquote></div><br>