just predefine stdc inttypes

[m6w6/ext-psi] / src / libffi.c

diff --git a/src/libffi.c b/src/libffi.c
index d01d907d36db2ded651f2eaaa8ee0c4336ff236d..1569693ee559e883e0c573de46f39124dc768281 100644 (file)
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -132,11 +132,8 @@ static inline ffi_type *psi_ffi_token_type(token_t t) {
                return &ffi_type_uint64;
        case PSI_T_BOOL:
                return &ffi_type_uchar;
-       case PSI_T_INT:
        case PSI_T_ENUM:
                return &ffi_type_sint;
-       case PSI_T_LONG:
-               return &ffi_type_slong;
        case PSI_T_FLOAT:
                return &ffi_type_float;
        case PSI_T_DOUBLE:
@@ -217,7 +214,7 @@ static ffi_type **psi_ffi_struct_type_elements(struct psi_decl_struct *strct) {
                        maxalign = type->alignment;
                }
 
-               assert(type->size == darg->layout->len);
+               assert(type->size <= darg->layout->len);
                if ((padding = psi_offset_padding(darg->layout->pos - offset, type->alignment))) {
                        if (nels + padding + 1 > argc) {
                                argc += padding;