From dda44e34f34a15138f9a57b4f85185ff51ec0726 Mon Sep 17 00:00:00 2001 From: luigi Date: Tue, 15 Mar 2016 12:52:12 +0000 Subject: [PATCH] sync with experimental git-svn-id: https://foundry.supelec.fr/svn/luatex/trunk@5850 0b2b3880-5936-4365-a048-eb17d2e5a6bf --- source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX | 13 +++++++++++++ source/libs/luajit/LuaJIT-src/src/lj_err.c | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX b/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX index c2818a71b..884d3392b 100644 --- a/source/libs/luajit/LuaJIT-PATCHES/patch-05-LuaJITTeX +++ b/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/source/libs/luajit/LuaJIT-src/src/lj_err.c b/source/libs/luajit/LuaJIT-src/src/lj_err.c index 01b86d112..a847ca07d 100644 --- a/source/libs/luajit/LuaJIT-src/src/lj_err.c +++ b/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; -- 2.11.4.GIT