diff options
author | H. Peter Anvin <hpa@zytor.com> | 2002-05-14 17:44:03 +0000 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2002-05-14 17:44:03 +0000 |
commit | 99941bf0675b8bee145145e043e0281acdab16ec (patch) | |
tree | 198821868b1c7700e2c82ca4a016a17611abddcf /preproc.c | |
parent | fe1bdcb23f58a4cd623676506351ee9021303f2c (diff) | |
download | nasm-99941bf0675b8bee145145e043e0281acdab16ec.tar.gz nasm-99941bf0675b8bee145145e043e0281acdab16ec.tar.bz2 nasm-99941bf0675b8bee145145e043e0281acdab16ec.zip |
Change __error (reserved namespace) to _error (normal namespace)
Diffstat (limited to 'preproc.c')
-rw-r--r-- | preproc.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -346,7 +346,7 @@ static Context *cstk; static Include *istk; static IncPath *ipath = NULL; -static efunc __error; /* Pointer to client-provided error reporting function */ +static efunc _error; /* Pointer to client-provided error reporting function */ static evalfunc evaluate; static int pass; /* HACK: pass 0 = generate dependencies only */ @@ -4018,10 +4018,10 @@ error(int severity, char *fmt, ...) va_end(arg); if (istk && istk->mstk && istk->mstk->name) - __error(severity | ERR_PASS1, "(%s:%d) %s", istk->mstk->name, + _error(severity | ERR_PASS1, "(%s:%d) %s", istk->mstk->name, istk->mstk->lineno, buff); else - __error(severity | ERR_PASS1, "%s", buff); + _error(severity | ERR_PASS1, "%s", buff); } static void @@ -4030,7 +4030,7 @@ pp_reset(char *file, int apass, efunc errfunc, evalfunc eval, { int h; - __error = errfunc; + _error = errfunc; cstk = NULL; istk = nasm_malloc(sizeof(Include)); istk->next = NULL; |