diff options
| author | Mike Pall <mike> | 2013-05-13 10:21:25 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-05-13 10:21:25 +0200 |
| commit | cc1e3425b9a297f3382b08202fb82838a3af8efb (patch) | |
| tree | 7b4d2c8e718d74d3327d8adcf02d8719d06bd814 | |
| parent | 8f90a1279e125a8cb9727751f76fb75214208f89 (diff) | |
| parent | 23aa02fb51ea8d9f45bad9e533fcb277ad858064 (diff) | |
| download | luajit-cc1e3425b9a297f3382b08202fb82838a3af8efb.tar.gz luajit-cc1e3425b9a297f3382b08202fb82838a3af8efb.tar.bz2 luajit-cc1e3425b9a297f3382b08202fb82838a3af8efb.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lib_ffi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib_ffi.c b/src/lib_ffi.c index 2ac8290b..5eac5688 100644 --- a/src/lib_ffi.c +++ b/src/lib_ffi.c | |||
| @@ -577,7 +577,7 @@ LJLIB_CF(ffi_istype) LJLIB_REC(.) | |||
| 577 | if (ctype_ispointer(ct1->info)) | 577 | if (ctype_ispointer(ct1->info)) |
| 578 | b = lj_cconv_compatptr(cts, ct1, ct2, CCF_IGNQUAL); | 578 | b = lj_cconv_compatptr(cts, ct1, ct2, CCF_IGNQUAL); |
| 579 | else if (ctype_isnum(ct1->info) || ctype_isvoid(ct1->info)) | 579 | else if (ctype_isnum(ct1->info) || ctype_isvoid(ct1->info)) |
| 580 | b = (((ct1->info ^ ct2->info) & ~CTF_QUAL) == 0); | 580 | b = (((ct1->info ^ ct2->info) & ~(CTF_QUAL|CTF_LONG)) == 0); |
| 581 | } else if (ctype_isstruct(ct1->info) && ctype_isptr(ct2->info) && | 581 | } else if (ctype_isstruct(ct1->info) && ctype_isptr(ct2->info) && |
| 582 | ct1 == ctype_rawchild(cts, ct2)) { | 582 | ct1 == ctype_rawchild(cts, ct2)) { |
| 583 | b = 1; | 583 | b = 1; |