diff options
| author | Mike Pall <mike> | 2022-07-13 00:37:14 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2022-07-13 00:37:14 +0200 |
| commit | 50936d784474747b4569d988767f1b5bab8bb6d0 (patch) | |
| tree | f0d1c12364b3a06332f80f5564ad259af3cb96ac /src/lib_ffi.c | |
| parent | b98b37231bd2dcb79e10b0f974cefd91eb0d7b3a (diff) | |
| parent | 899093a9e0fa5b16f27016381ef4b15529dadff2 (diff) | |
| download | luajit-50936d784474747b4569d988767f1b5bab8bb6d0.tar.gz luajit-50936d784474747b4569d988767f1b5bab8bb6d0.tar.bz2 luajit-50936d784474747b4569d988767f1b5bab8bb6d0.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lib_ffi.c')
| -rw-r--r-- | src/lib_ffi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib_ffi.c b/src/lib_ffi.c index ac2b2742..2295cf15 100644 --- a/src/lib_ffi.c +++ b/src/lib_ffi.c | |||
| @@ -639,7 +639,7 @@ LJLIB_CF(ffi_alignof) LJLIB_REC(ffi_xof FF_ffi_alignof) | |||
| 639 | CTState *cts = ctype_cts(L); | 639 | CTState *cts = ctype_cts(L); |
| 640 | CTypeID id = ffi_checkctype(L, cts, NULL); | 640 | CTypeID id = ffi_checkctype(L, cts, NULL); |
| 641 | CTSize sz = 0; | 641 | CTSize sz = 0; |
| 642 | CTInfo info = lj_ctype_info(cts, id, &sz); | 642 | CTInfo info = lj_ctype_info_raw(cts, id, &sz); |
| 643 | setintV(L->top-1, 1 << ctype_align(info)); | 643 | setintV(L->top-1, 1 << ctype_align(info)); |
| 644 | return 1; | 644 | return 1; |
| 645 | } | 645 | } |
| @@ -770,7 +770,7 @@ LJLIB_CF(ffi_metatype) | |||
| 770 | CTypeID id = ffi_checkctype(L, cts, NULL); | 770 | CTypeID id = ffi_checkctype(L, cts, NULL); |
| 771 | GCtab *mt = lj_lib_checktab(L, 2); | 771 | GCtab *mt = lj_lib_checktab(L, 2); |
| 772 | GCtab *t = cts->miscmap; | 772 | GCtab *t = cts->miscmap; |
| 773 | CType *ct = ctype_get(cts, id); /* Only allow raw types. */ | 773 | CType *ct = ctype_raw(cts, id); |
| 774 | TValue *tv; | 774 | TValue *tv; |
| 775 | GCcdata *cd; | 775 | GCcdata *cd; |
| 776 | if (!(ctype_isstruct(ct->info) || ctype_iscomplex(ct->info) || | 776 | if (!(ctype_isstruct(ct->info) || ctype_iscomplex(ct->info) || |