diff options
| author | Mike Pall <mike> | 2013-12-29 19:21:58 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-12-29 19:21:58 +0100 |
| commit | 87b33b98e1ee97bddd4b5cdee34c0971e25a2a0e (patch) | |
| tree | 84d7fa6807cf5ddaf6ec5484a96f3f2b1e6f295f | |
| parent | dce3639c1d21a768d91c44f549b2a88c42b8a814 (diff) | |
| parent | b779f31ca37bcb51dedf5b8d35f91e297e6a729d (diff) | |
| download | luajit-87b33b98e1ee97bddd4b5cdee34c0971e25a2a0e.tar.gz luajit-87b33b98e1ee97bddd4b5cdee34c0971e25a2a0e.tar.bz2 luajit-87b33b98e1ee97bddd4b5cdee34c0971e25a2a0e.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/host/genminilua.lua | 1 | ||||
| -rw-r--r-- | src/host/minilua.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/host/genminilua.lua b/src/host/genminilua.lua index e666f088..7ba39d47 100644 --- a/src/host/genminilua.lua +++ b/src/host/genminilua.lua | |||
| @@ -210,6 +210,7 @@ typedef unsigned __int64 U64; | |||
| 210 | #else | 210 | #else |
| 211 | typedef unsigned long long U64; | 211 | typedef unsigned long long U64; |
| 212 | #endif | 212 | #endif |
| 213 | int _CRT_glob = 0; | ||
| 213 | ]]}, {} | 214 | ]]}, {} |
| 214 | 215 | ||
| 215 | local function preprocess(src) | 216 | local function preprocess(src) |
diff --git a/src/host/minilua.c b/src/host/minilua.c index 93e9273e..aee192a7 100644 --- a/src/host/minilua.c +++ b/src/host/minilua.c | |||
| @@ -27,6 +27,7 @@ typedef unsigned __int64 U64; | |||
| 27 | #else | 27 | #else |
| 28 | typedef unsigned long long U64; | 28 | typedef unsigned long long U64; |
| 29 | #endif | 29 | #endif |
| 30 | int _CRT_glob = 0; | ||
| 30 | #include <stddef.h> | 31 | #include <stddef.h> |
| 31 | #include <stdarg.h> | 32 | #include <stdarg.h> |
| 32 | #include <limits.h> | 33 | #include <limits.h> |