From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- 3rdparty/lua/src/lundump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '3rdparty/lua/src/lundump.c') diff --git a/3rdparty/lua/src/lundump.c b/3rdparty/lua/src/lundump.c index 71bb1512142..4080af9c0d9 100644 --- a/3rdparty/lua/src/lundump.c +++ b/3rdparty/lua/src/lundump.c @@ -234,7 +234,7 @@ static void fchecksize (LoadState *S, size_t size, const char *tname) { #define checksize(S,t) fchecksize(S,sizeof(t),#t) static void checkHeader (LoadState *S) { - checkliteral(S, (const char *)(LUA_SIGNATURE) + 1, "not a"); /* 1st char already checked */ + checkliteral(S, LUA_SIGNATURE + 1, "not a"); /* 1st char already checked */ if (LoadByte(S) != LUAC_VERSION) error(S, "version mismatch in"); if (LoadByte(S) != LUAC_FORMAT) -- cgit v1.2.3-70-g09d2