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/com_err/lex.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/heimdal/lib/com_err/lex.l') diff --git a/source4/heimdal/lib/com_err/lex.l b/source4/heimdal/lib/com_err/lex.l index b68814b21c..f099c1e1bd 100644 --- a/source4/heimdal/lib/com_err/lex.l +++ b/source4/heimdal/lib/com_err/lex.l @@ -94,7 +94,7 @@ getstring(void) continue; } if(c == '\n'){ - error_message("unterminated string"); + lex_err_message("unterminated string"); lineno++; break; } @@ -114,7 +114,7 @@ getstring(void) } void -error_message (const char *format, ...) +lex_err_message (const char *format, ...) { va_list args; -- cgit