On Tue, 15 Jun 2004 08:09:42 -0400, Michael George <[EMAIL PROTECTED]> 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 _______________________________________________ Asterisk-Users mailing list [EMAIL PROTECTED] http://lists.digium.com/mailman/listinfo/asterisk-users To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-users

Reply via email to