fs installation is broken in version: FreeSWITCH Version 1.0.trunk (14500M)
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
You have a merge conflict. svn revert sofia_glue.c /b On Aug 12, 2009, at 12:59 PM, Milena 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
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@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@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
It's modified because it wouldn't compile with those "<<<<<<" at the end of the file 2009/8/12 Michael Jerris <mike@jerris.com>
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@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@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
_______________________________________________ FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
Ok, done and fixed, thank you very much :) 2009/8/12 Milena <testeador01@gmail.com>
It's modified because it wouldn't compile with those "<<<<<<" at the end of the file
2009/8/12 Michael Jerris <mike@jerris.com>
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@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@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE: http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
_______________________________________________ FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
Hi there, Does anyone have the URL for where I might find all the electronic versions of the presentations made at ClueCon last week? Thanks!
They are all getting gathered up and put online... files.freeswitch.org/cluecon_2009 just keep an eye there some of the videos are up also. /b On Aug 12, 2009, at 2:18 PM, Christian Jensen wrote:
Hi there,
Does anyone have the URL for where I might find all the electronic versions of the presentations made at ClueCon last week?
Thanks! _______________________________________________ FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
On Wed, Aug 12, 2009 at 2:25 PM, Brian West <brian@freeswitch.org> wrote:
They are all getting gathered up and put online... files.freeswitch.org/cluecon_2009 just keep an eye there some of the videos are up also. /b
FYI, I've uploaded the first batch and they should get synched up on files.freeswitch.org/cluecon_2009/presentations any time... -MC
Just seen Anthony presentation, very cool ;) Everyone, watch it! http://files.freeswitch.org/cluecon_2009/presentations/Day%2001%20Presentati... =D On Wed, Aug 12, 2009 at 5:07 PM, Michael Collins <msc@freeswitch.org> wrote:
On Wed, Aug 12, 2009 at 2:25 PM, Brian West <brian@freeswitch.org> wrote:
They are all getting gathered up and put online... files.freeswitch.org/cluecon_2009 just keep an eye there some of the videos are up also. /b
FYI,
I've uploaded the first batch and they should get synched up on files.freeswitch.org/cluecon_2009/presentations any time... -MC
_______________________________________________ FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org
participants (6)
-
Brian West
-
Christian Jensen
-
Diego Viola
-
Michael Collins
-
Michael Jerris
-
Milena