VoIP Mailing List Archives
Mailing list archives for the VoIP community |
|
| View previous topic :: View next topic |
| Author |
Message |
testeador01 at gmail.com
Guest
|
 Posted: Wed Aug 12, 2009 1:06 pm Post subject: [Freeswitch-users] fs installation is broken in version: Fre |
 |
|
I just did a rebootstrap on a fs box, it turned out the new revision has this at the end of mod_sofia.h:
| Quote: | 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  |
|
| Back to top |
|
 |
brian at freeswitch.org
Guest
|
| Posted: Wed Aug 12, 2009 1:22 pm Post subject: [Freeswitch-users] fs installation is broken in version: Fre |
|
|
You have a merge conflict. svn revert sofia_glue.c
/b
On Aug 12, 2009, at 12:59 PM, Milena wrote:
| Quote: | 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);
no wonder why it wouldn't compile
|
_______________________________________________
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 |
|
| Back to top |
|
|
mike at jerris.com
Guest
|
| Posted: Wed Aug 12, 2009 1:26 pm Post subject: [Freeswitch-users] fs installation is broken in version: Fre |
|
|
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:
| Quote: | 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);
no wonder why it wouldn't compile
_______________________________________________
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 |
|
| Back to top |
|
|
testeador01 at gmail.com
Guest
|
| Posted: Wed Aug 12, 2009 1:33 pm Post subject: [Freeswitch-users] fs installation is broken in version: Fre |
|
|
It's modified because it wouldn't compile with those "<<<<<<" at the end of the file
2009/8/12 Michael Jerris <mike@jerris.com (mike@jerris.com)>
|
|
| Back to top |
|
|
testeador01 at gmail.com
Guest
|
| Posted: Wed Aug 12, 2009 1:39 pm Post subject: [Freeswitch-users] fs installation is broken in version: Fre |
|
|
Ok, done and fixed, thank you very much 
2009/8/12 Milena <testeador01@gmail.com (testeador01@gmail.com)>
| Quote: | It's modified because it wouldn't compile with those "<<<<<<" at the end of the file
2009/8/12 Michael Jerris <mike@jerris.com (mike@jerris.com)>
|
|
|
| Back to top |
|
|
|
|
|
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
|
Powered by phpBB © 2001, 2005 phpBB Group
|
Search
