Merge branch 'master' into v2.1

master
Mike Pall 2013-05-13 10:21:25 +02:00
commit cc1e3425b9
1 changed files with 1 additions and 1 deletions

View File

@ -577,7 +577,7 @@ LJLIB_CF(ffi_istype) LJLIB_REC(.)
if (ctype_ispointer(ct1->info))
b = lj_cconv_compatptr(cts, ct1, ct2, CCF_IGNQUAL);
else if (ctype_isnum(ct1->info) || ctype_isvoid(ct1->info))
b = (((ct1->info ^ ct2->info) & ~CTF_QUAL) == 0);
b = (((ct1->info ^ ct2->info) & ~(CTF_QUAL|CTF_LONG)) == 0);
} else if (ctype_isstruct(ct1->info) && ctype_isptr(ct2->info) &&
ct1 == ctype_rawchild(cts, ct2)) {
b = 1;