diff options
author | Mike Pall <mike> | 2012-05-08 18:34:12 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2012-05-08 18:34:12 +0200 |
commit | 886a450a3d3b47ebffb2b21334b872ebedf1e3c8 (patch) | |
tree | a36ede63e2501d410a7f9de436c6678c96819ed1 /src/lj_cparse.c | |
parent | 0d824b7d1417dbb89468d2b6093c2fad127fcc06 (diff) | |
download | luajit2-886a450a3d3b47ebffb2b21334b872ebedf1e3c8.tar.gz |
FFI: Allow 'typedef _Bool int BOOL;' to make Windows users happy.
Diffstat (limited to 'src/lj_cparse.c')
-rw-r--r-- | src/lj_cparse.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lj_cparse.c b/src/lj_cparse.c index 526332d4..ff5abc70 100644 --- a/src/lj_cparse.c +++ b/src/lj_cparse.c @@ -1502,8 +1502,13 @@ end_decl: /* Determine type info and size. */ CTInfo info = CTINFO(CT_NUM, (cds & CDF_UNSIGNED) ? CTF_UNSIGNED : 0); if ((cds & CDF_BOOL)) { - info = CTINFO(CT_NUM, CTF_UNSIGNED|CTF_BOOL); - lua_assert(sz == 1); + if ((cds & ~(CDF_SCL|CDF_BOOL|CDF_INT|CDF_SIGNED|CDF_UNSIGNED))) + cp_errmsg(cp, 0, LJ_ERR_FFI_INVTYPE); + info |= CTF_BOOL; + if (!sz) { + if (!(cds & CDF_SIGNED)) info |= CTF_UNSIGNED; + sz = 1; + } } else if ((cds & CDF_FP)) { info = CTINFO(CT_NUM, CTF_FP); if ((cds & CDF_LONG)) sz = sizeof(long double); |