<div>Hi all,</div>
<div> </div>
<div>I just updated zaptel and asterisk, but after doing CVS update of asterisk (from CVS-HEAD <font size="2">2005-08-10 17:10:53) I got a file conflict message</font></div>
<blockquote dir="ltr" style="MARGIN-RIGHT: 0px">
<div>conflicts:<br>ast_expr2.h<br>ast_expr2f.c</div></blockquote>
<div>I ignored them, and then tried to compile asterisk: make clean, make , make install. But then the problem shows again, leaving this message:</div>
<blockquote dir="ltr" style="MARGIN-RIGHT: 0px">
<div>ast_expr2f.c:1784: warning: no previous prototype for `ast_yyget_column'<br>ast_expr2f.c:1860: warning: no previous prototype for `ast_yyset_column'<br>ast_expr2.fl:95: error: conflicting types for `ast_expr'<br>include/asterisk/ast_expr.h:26: error: previous declaration of `ast_expr'
<br>ast_expr2f.c:1259: warning: `yyunput' defined but not used<br>make: *** [ast_expr2f.o] Error 1</div></blockquote>
<div>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?</div>
<div>I hope someone can give me a hint about this.</div>
<div> </div>
<div>Thanks in advance</div>
<div>Regards,</div>
<div>Claudio</div>
<div> </div>