From 4bd7814a4e2970a1276b91b93987ce4fa9406c19 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 29 Oct 2010 11:46:44 +1100 Subject: s4-heimdal: fixed the use of error_message() in heimdal the lex code in heimdal had a function error_message() which conflicts with a function from the com_err library. This replaces it with lex_err_message() Pair-Programmed-With: Andrew Bartlett --- source4/heimdal/lib/asn1/lex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/heimdal/lib/asn1/lex.c') diff --git a/source4/heimdal/lib/asn1/lex.c b/source4/heimdal/lib/asn1/lex.c index 612d336168..fd19f23f8d 100644 --- a/source4/heimdal/lib/asn1/lex.c +++ b/source4/heimdal/lib/asn1/lex.c @@ -1657,7 +1657,7 @@ YY_RULE_SETUP yylval.constant = strtol((const char *)yytext, &e, 0); if(e == y) - error_message("malformed constant (%s)", yytext); + lex_err_message("malformed constant (%s)", yytext); else return NUMBER; } @@ -1694,7 +1694,7 @@ YY_RULE_SETUP case 94: YY_RULE_SETUP #line 273 "lex.l" -{ error_message("Ignoring char(%c)\n", *yytext); } +{ lex_err_message("Ignoring char(%c)\n", *yytext); } YY_BREAK case 95: YY_RULE_SETUP @@ -2712,7 +2712,7 @@ yywrap () #endif void -error_message (const char *format, ...) +lex_err_message (const char *format, ...) { va_list args; @@ -2726,6 +2726,6 @@ error_message (const char *format, ...) static void unterminated(const char *type, unsigned start_lineno) { - error_message("unterminated %s, possibly started on line %d\n", type, start_lineno); + lex_err_message("unterminated %s, possibly started on line %d\n", type, start_lineno); } -- cgit