summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-03-15 22:10:27 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-03-15 22:10:27 +0000
commitfc81437ea2629854b88afbfcac2be93cacf93bc1 (patch)
tree2410c62d55c7875583171f47c2c68eca0bf765ee
parent535baf9fe4f262d75b43494d263af1e7d8f05dd1 (diff)
libs/luajit: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@40036 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX13
-rw-r--r--Build/source/libs/luajit/LuaJIT-src/src/lj_err.c1
2 files changed, 13 insertions, 1 deletions
diff --git a/Build/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX b/Build/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX
index c2818a71b9d..884d3392bf7 100644
--- a/Build/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX
+++ b/Build/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX
@@ -71,3 +71,16 @@ diff -bur LuaJIT-src-orig/src/lj_str.c LuaJIT-src/src/lj_str.c
o = gcref(g->strhash[h & g->strmask]);
if (LJ_LIKELY((((uintptr_t)str+len-1) & (LJ_PAGESIZE-1)) <= LJ_PAGESIZE-4)) {
+diff -bur LuaJIT-src-orig/src/lj_err.c LuaJIT-src/src/lj_err.c
+--- LuaJIT-src-orig/src/lj_err.c 2016-03-15 12:06:56.844436191 +0100
++++ LuaJIT-src/src/lj_err.c 2016-03-15 11:58:30.000000000 +0100
+@@ -310,7 +310,6 @@
+ #define _US_FORCE_UNWIND 8
+
+ typedef struct _Unwind_Control_Block _Unwind_Control_Block;
+-typedef struct _Unwind_Context _Unwind_Context;
+
+ struct _Unwind_Control_Block {
+ uint64_t exclass;
+
+
diff --git a/Build/source/libs/luajit/LuaJIT-src/src/lj_err.c b/Build/source/libs/luajit/LuaJIT-src/src/lj_err.c
index 01b86d1129d..a847ca07db2 100644
--- a/Build/source/libs/luajit/LuaJIT-src/src/lj_err.c
+++ b/Build/source/libs/luajit/LuaJIT-src/src/lj_err.c
@@ -310,7 +310,6 @@ static void err_raise_ext(int errcode)
#define _US_FORCE_UNWIND 8
typedef struct _Unwind_Control_Block _Unwind_Control_Block;
-typedef struct _Unwind_Context _Unwind_Context;
struct _Unwind_Control_Block {
uint64_t exclass;