diff options
| author | Mike Pall <mike> | 2019-12-08 18:58:50 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2019-12-08 18:58:50 +0100 |
| commit | 6e228a9cb68887153462365b70d54b2fff871050 (patch) | |
| tree | 3f17b8f2fa6a41383345f84b99da31408b67e95e /src/lj_def.h | |
| parent | e45b04f49953b4e0cc2b3cec4dbe4c2c0a2656f3 (diff) | |
| parent | c6c6e3b416635a528a711ed1986b054287a7c491 (diff) | |
| download | luajit-6e228a9cb68887153462365b70d54b2fff871050.tar.gz luajit-6e228a9cb68887153462365b70d54b2fff871050.tar.bz2 luajit-6e228a9cb68887153462365b70d54b2fff871050.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_def.h')
| -rw-r--r-- | src/lj_def.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_def.h b/src/lj_def.h index e67bb24c..b1208f6b 100644 --- a/src/lj_def.h +++ b/src/lj_def.h | |||
| @@ -8,8 +8,8 @@ | |||
| 8 | 8 | ||
| 9 | #include "lua.h" | 9 | #include "lua.h" |
| 10 | 10 | ||
| 11 | #if defined(_MSC_VER) | 11 | #if defined(_MSC_VER) && (_MSC_VER < 1700) |
| 12 | /* MSVC is stuck in the last century and doesn't have C99's stdint.h. */ | 12 | /* Old MSVC is stuck in the last century and doesn't have C99's stdint.h. */ |
| 13 | typedef __int8 int8_t; | 13 | typedef __int8 int8_t; |
| 14 | typedef __int16 int16_t; | 14 | typedef __int16 int16_t; |
| 15 | typedef __int32 int32_t; | 15 | typedef __int32 int32_t; |