summaryrefslogtreecommitdiff
path: root/source4/heimdal/lib/com_err/lex.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-29 11:46:44 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-30 23:48:59 +1100
commit4bd7814a4e2970a1276b91b93987ce4fa9406c19 (patch)
treebe4d9bc1d7afd692278c4df9e6cd6c24eeb71a81 /source4/heimdal/lib/com_err/lex.h
parentd6299d2667909487986782afc596cca45f2cbdac (diff)
downloadsamba-4bd7814a4e2970a1276b91b93987ce4fa9406c19.tar.gz
samba-4bd7814a4e2970a1276b91b93987ce4fa9406c19.tar.bz2
samba-4bd7814a4e2970a1276b91b93987ce4fa9406c19.zip
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 <abartlet@samba.org>
Diffstat (limited to 'source4/heimdal/lib/com_err/lex.h')
-rw-r--r--source4/heimdal/lib/com_err/lex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/heimdal/lib/com_err/lex.h b/source4/heimdal/lib/com_err/lex.h
index 76f3e2b2a5..abfec922f0 100644
--- a/source4/heimdal/lib/com_err/lex.h
+++ b/source4/heimdal/lib/com_err/lex.h
@@ -33,7 +33,7 @@
/* $Id$ */
-void error_message (const char *, ...)
+void lex_err_message (const char *, ...)
__attribute__ ((format (printf, 1, 2)));
int yylex(void);