flush

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

diff --git a/src/libffi.c b/src/libffi.c
index 1f5bf016a8a714add395b3fb7a0de32b801eda43..301995e5903d9bc377c3d2630f1be48fed9e0513 100644 (file)
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -88,6 +88,7 @@ static inline ffi_type *psi_ffi_token_type(token_t t) {
        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;
@@ -191,7 +192,8 @@ static ffi_type **psi_ffi_struct_type_elements(decl_struct *strct) {
 static inline ffi_type *psi_ffi_decl_type(decl_type *type) {
        decl_type *real = real_decl_type(type);
 
-       if (real->type == PSI_T_STRUCT) {
+       switch (real->type) {
+       case PSI_T_STRUCT:
                if (!real->strct->engine.type) {
                        ffi_type *strct = calloc(1, sizeof(ffi_type));
 
@@ -204,8 +206,13 @@ static inline ffi_type *psi_ffi_decl_type(decl_type *type) {
                }
 
                return real->strct->engine.type;
+
+       case PSI_T_UNION:
+               return psi_ffi_decl_arg_type(real->unn->args->args[0]);
+
+       default:
+               return psi_ffi_token_type(real->type);
        }
-       return psi_ffi_token_type(real->type);
 }
 static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg) {
        if (darg->var->pointer_level) {