[Freeswitch-users] fs installation is broken in version: FreeSWITCH Version 1.0.trunk (14500M)

[Michael Jerris]

The M in the version number means modified.  You had local code  
changes that conflicted when you updated trunk.  Revert the changes to  
that file and it should be fine.

Mike

On Aug 12, 2009, at 10:59 AM, Milena <testeador01 at gmail.com> wrote:

> I just did a rebootstrap on a fs box, it turned out the new revision  
> has this at the end of mod_sofia.h:
>
> char *sofia_glue_get_extra_headers(switch_channel_t *channel, const  
> char *prefix);
> <<<<<<< .mine
> void sofia_glue_set_extra_headers(switch_channel_t *channel, sip_t  
> const *sip, const char *prefix);
>
> =======
> void sofia_glue_set_extra_headers(switch_channel_t *channel, sip_t  
> const *sip, const char *prefix);
> >>>>>>> .r14490
>
> no wonder why it wouldn't compile :P
>
>
> _______________________________________________
> FreeSWITCH-users mailing list
> FreeSWITCH-users at lists.freeswitch.org
> http://lists.freeswitch.org/mailman/listinfo/freeswitch-users
> UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users
> http://www.freeswitch.org