From 077a18f5764a12e6c6dd25efedd3a8febd402fd2 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Tue, 24 Nov 2009 13:41:24 +0100 Subject: Fix compile with newer gcc. --- crawl-ref/source/clua.cc | 6 +++--- crawl-ref/source/clua.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc index 8506d5d143..478852e860 100644 --- a/crawl-ref/source/clua.cc +++ b/crawl-ref/source/clua.cc @@ -468,7 +468,7 @@ bool CLua::calltopfn(lua_State *ls, const char *params, va_list args, } maybe_bool CLua::callmbooleanfn(const char *fn, const char *params, - const va_list *args) + va_list args) { error.clear(); lua_State *ls = state(); @@ -484,7 +484,7 @@ maybe_bool CLua::callmbooleanfn(const char *fn, const char *params, CL_RESETSTACK_RETURN(ls, stacktop, B_MAYBE); } - bool ret = calltopfn(ls, params, *args, 1); + bool ret = calltopfn(ls, params, args, 1); if (!ret) CL_RESETSTACK_RETURN(ls, stacktop, B_MAYBE); @@ -496,7 +496,7 @@ maybe_bool CLua::callmbooleanfn(const char *fn, const char *params, ...) { va_list args; va_start(args, params); - return (callmbooleanfn(fn, params, &args)); + return (callmbooleanfn(fn, params, args)); } bool CLua::callbooleanfn(bool def, const char *fn, const char *params, ...) diff --git a/crawl-ref/source/clua.h b/crawl-ref/source/clua.h index 6877c47a18..16f789bff4 100644 --- a/crawl-ref/source/clua.h +++ b/crawl-ref/source/clua.h @@ -191,7 +191,7 @@ private: bool calltopfn(lua_State *ls, const char *format, va_list args, int retc = -1, va_list *fnr = NULL); maybe_bool callmbooleanfn(const char *fn, const char *params, - const va_list *args); + va_list args); int push_args(lua_State *ls, const char *format, va_list args, va_list *cpto = NULL); -- cgit v1.2.3-54-g00ecf