From: Mike Pall <mike>
Date: Mon, 2 Feb 2015 10:06:34 +0000 (+0100)
Subject: Merge branch 'master' into v2.1
X-Git-Tag: v2.1.0-beta1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca5bbdf92a1802cc95ccb40157dfafd482e56480;p=thirdparty%2FLuaJIT.git

Merge branch 'master' into v2.1
---

ca5bbdf92a1802cc95ccb40157dfafd482e56480
diff --cc src/lj_lex.c
index ad3f1306,e1dc3cdf..8409cd78
--- a/src/lj_lex.c
+++ b/src/lj_lex.c
@@@ -375,6 -378,7 +375,7 @@@ int lj_lex_setup(lua_State *L, LexStat
    ls->vtop = 0;
    ls->bcstack = NULL;
    ls->sizebcstack = 0;
 -  ls->token = 0;
++  ls->tok = 0;
    ls->lookahead = TK_eof;  /* No look-ahead token. */
    ls->linenumber = 1;
    ls->lastline = 1;