On 14:58, Thu 29 Sep 05, Claudio Canseco wrote: > Hi all, > I just updated zaptel and asterisk, but after doing CVS update of asterisk > (from CVS-HEAD 2005-08-10 17:10:53) I got a file conflict message > > conflicts: > ast_expr2.h > ast_expr2f.c > > I ignored them, and then tried to compile asterisk: make clean, make , make > install. But then the problem shows again, leaving this message: > > ast_expr2f.c:1784: warning: no previous prototype for `ast_yyget_column' > ast_expr2f.c:1860: warning: no previous prototype for `ast_yyset_column' > ast_expr2.fl:95: error: conflicting types for `ast_expr' > include/asterisk/ast_expr.h:26: error: previous declaration of `ast_expr' > ast_expr2f.c:1259: warning: `yyunput' defined but not used > make: *** [ast_expr2f.o] Error 1 > > Any suggestions about how to deal with this conflicts, and if I can't fix > that conflict can i go back to my previous CVS version ? and how? > I hope someone can give me a hint about this. > Thanks in advance
Hi, Remove the 2 files, and update from CVS again :) -- Michiel van Baak http://michiel.vanbaak.info [EMAIL PROTECTED] GnuPG key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x7E0B9A2D "Why is it drug addicts and computer afficionados are both called users?" _______________________________________________ --Bandwidth and Colocation sponsored by Easynews.com -- 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
