diff options
| author | Mike Pall <mike> | 2014-05-06 14:49:54 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-05-06 14:49:54 +0200 |
| commit | 392b6c94ae4b969f7fc74b21501b5e884c002892 (patch) | |
| tree | 24d521e937e84c376786c5eb4213c5504b9dd591 /src | |
| parent | f7e209cc5568ebecdbf4674f01a95931fd51c54f (diff) | |
| parent | 29172880192471b12e699718a906ff1b9a270fe4 (diff) | |
| download | luajit-392b6c94ae4b969f7fc74b21501b5e884c002892.tar.gz luajit-392b6c94ae4b969f7fc74b21501b5e884c002892.tar.bz2 luajit-392b6c94ae4b969f7fc74b21501b5e884c002892.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 5aafbd7c..74b73301 100644 --- a/src/lj_err.c +++ b/src/lj_err.c | |||
| @@ -379,7 +379,7 @@ typedef struct UndocumentedDispatcherContext { | |||
| 379 | ULONG64 EstablisherFrame; | 379 | ULONG64 EstablisherFrame; |
| 380 | ULONG64 TargetIp; | 380 | ULONG64 TargetIp; |
| 381 | PCONTEXT ContextRecord; | 381 | PCONTEXT ContextRecord; |
| 382 | PEXCEPTION_ROUTINE LanguageHandler; | 382 | void (*LanguageHandler)(void); |
| 383 | PVOID HandlerData; | 383 | PVOID HandlerData; |
| 384 | PUNWIND_HISTORY_TABLE HistoryTable; | 384 | PUNWIND_HISTORY_TABLE HistoryTable; |
| 385 | ULONG ScopeIndex; | 385 | ULONG ScopeIndex; |