BRANCH LuaJIT-2.1

This commit is contained in:
Mike Pall
2013-02-21 16:49:04 +01:00
parent d4bc6ab756
commit 61fb587d2c
9 changed files with 27 additions and 20 deletions

View File

@@ -41,7 +41,7 @@
-- Cache some library functions and objects.
local jit = require("jit")
assert(jit.version_num == 20001, "LuaJIT core/library version mismatch")
assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
local jutil = require("jit.util")
local vmdef = require("jit.vmdef")
local bit = require("bit")

View File

@@ -11,7 +11,7 @@
------------------------------------------------------------------------------
local jit = require("jit")
assert(jit.version_num == 20001, "LuaJIT core/library version mismatch")
assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
local bit = require("bit")
-- Symbol name prefix for LuaJIT bytecode.

View File

@@ -54,7 +54,7 @@
-- Cache some library functions and objects.
local jit = require("jit")
assert(jit.version_num == 20001, "LuaJIT core/library version mismatch")
assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
local jutil = require("jit.util")
local vmdef = require("jit.vmdef")
local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc

View File

@@ -59,7 +59,7 @@
-- Cache some library functions and objects.
local jit = require("jit")
assert(jit.version_num == 20001, "LuaJIT core/library version mismatch")
assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
local jutil = require("jit.util")
local vmdef = require("jit.vmdef")
local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo

View File

@@ -30,12 +30,12 @@
#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
#ifdef LUA_XROOT
#define LUA_JDIR LUA_XROOT "share/luajit-2.0.1/"
#define LUA_JDIR LUA_XROOT "share/luajit-2.1.0-alpha/"
#define LUA_XPATH \
";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
#define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;"
#else
#define LUA_JDIR LUA_ROOT "share/luajit-2.0.1/"
#define LUA_JDIR LUA_ROOT "share/luajit-2.1.0-alpha/"
#define LUA_XPATH
#define LUA_XCPATH
#endif

View File

@@ -30,9 +30,9 @@
#include "lua.h"
#define LUAJIT_VERSION "LuaJIT 2.0.1"
#define LUAJIT_VERSION_NUM 20001 /* Version 2.0.1 = 02.00.01. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_0_1
#define LUAJIT_VERSION "LuaJIT 2.1.0-alpha"
#define LUAJIT_VERSION_NUM 20100 /* Version 2.1.0 = 02.01.00. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_0_alpha
#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2013 Mike Pall"
#define LUAJIT_URL "http://luajit.org/"