diff options
| author | Mike Pall <mike> | 2014-02-06 12:27:02 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-02-06 12:27:02 +0100 |
| commit | ec5546d1d20c640f024c05f230418580b1d416e1 (patch) | |
| tree | 56bb6e966ea6eed83eb5593550dfcbfdc1b5af1f /src | |
| parent | b20ff7a8aca4ef9bbd228d9f86dc8f7a77afe9ad (diff) | |
| parent | 2be62dcfcdea2c60047335e613fe5bd0b85911c2 (diff) | |
| download | luajit-ec5546d1d20c640f024c05f230418580b1d416e1.tar.gz luajit-ec5546d1d20c640f024c05f230418580b1d416e1.tar.bz2 luajit-ec5546d1d20c640f024c05f230418580b1d416e1.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_err.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_err.c b/src/lj_err.c index 917fc697..5aafbd7c 100644 --- a/src/lj_err.c +++ b/src/lj_err.c | |||
| @@ -197,7 +197,7 @@ static void *err_unwind(lua_State *L, void *stopcf, int errcode) | |||
| 197 | typedef struct _Unwind_Exception | 197 | typedef struct _Unwind_Exception |
| 198 | { | 198 | { |
| 199 | uint64_t exclass; | 199 | uint64_t exclass; |
| 200 | void (*excleanup)(int, struct _Unwind_Exception); | 200 | void (*excleanup)(int, struct _Unwind_Exception *); |
| 201 | uintptr_t p1, p2; | 201 | uintptr_t p1, p2; |
| 202 | } __attribute__((__aligned__)) _Unwind_Exception; | 202 | } __attribute__((__aligned__)) _Unwind_Exception; |
| 203 | 203 | ||