I am trying to build asterisk and having an odd problem compiling it. I got the source this morning from CVS with "make update". I then did a "make", but I'm getting errors in app/app_voicemail.c... On line 155 begins a section which almost looks like patch material. The first line is: <<<<<<< app_voicemail.c and then there is some C code defining adapp and adsec, then ====== and some more C code defining adapp and adsec again, followed by >>>>>>> 1.111 Obviously this is not a small oversight as it's not even close to correct syntax, so it must be serving some function. I cannot find any docs about it... Perhaps this is just a marker for the user to choose which values those variables should have. Anyone with any advice? -Michael
On Tue, 15 Jun 2004 08:09:42 -0400, Michael George <george@auroravideosys.com> wrote:> I am trying to build asterisk and having an odd problem compiling it. I > got the source this morning from CVS with "make update". I then did a > "make", but I'm getting errors in app/app_voicemail.c... > > On line 155 begins a section which almost looks like patch material. > The first line is: > <<<<<<< app_voicemail.c > > and then there is some C code defining adapp and adsec, then > ======> > and some more C code defining adapp and adsec again, followed by > >>>>>>> 1.111 > > Obviously this is not a small oversight as it's not even close to > correct syntax, so it must be serving some function. I cannot find any > docs about it... Perhaps this is just a marker for the user to choose > which values those variables should have. > > Anyone with any advice?This is CVS indicating that you hae a conflict in that file. If there are no changes in it that you require, I'd move it out of the way and run cvs up again ... -- -S
> On line 155 begins a section which almost looks like patch material. > The first line is: > <<<<<<< app_voicemail.cDoes rm app_voicemail.c cvs co app_voicemail.c help?
On Tue, 15 Jun 2004, Michael George wrote:> On line 155 begins a section which almost looks like patch material. > The first line is: > <<<<<<< app_voicemail.c > > and then there is some C code defining adapp and adsec, then > ======> > and some more C code defining adapp and adsec again, followed by > >>>>>>> 1.111You made some local changes in app_voicemail.c - or maybe applied a patch that changed app_voicemail.c - and then did a cvs update. There was a conflict between your local change and a change made in CVS. cvs put both versions in your file, delimited as you see. You need to manually merge the two - or maybe drop one and keep the other entirely. Steve
Hi I am kindda new to this mailing list. I have buit asterisk alrealdy once, but this time I am having a hard time to build it. Does anyone have anysuggestion why am I getting so many errors. Thanks Felippe Kilian Martins _________________________________________________________________ MSN Messenger: instale grĂ¡tis e converse com seus amigos. http://messenger.msn.com.br
Is your computer turned on? If not, turn it on and try building Asterisk again... Otherwise, it could be any number of things.> -----Original Message----- > From: Felippe Martins [mailto:kilian14@hotmail.com] > Sent: Wednesday, July 21, 2004 1:20 PM > To: asterisk-users@lists.digium.com > Subject: [Asterisk-Users] Building Asterisk > > > Hi I am kindda new to this mailing list. I have buit asterisk > alrealdy once, > but this time I am having a hard time to build it. Does anyone have > anysuggestion why am I getting so many errors. > Thanks > Felippe Kilian Martins