Merge branch 'slimconfigure'

[m6w6/ext-psi] / src / types.h

diff --git a/src/types.h b/src/types.h
index 0c0ca497ea023647e07abee61b802886f13e06d5..220793c902652f9f1bb78ea8dd84623fb9d17ac5 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -33,15 +33,16 @@
 #include "types/decl_arg.h"
 #include "types/decl_abi.h"
 #include "types/decl.h"
+#include "types/decl_extvar.h"
 #include "types/decl_struct.h"
 #include "types/decl_union.h"
 #include "types/impl_type.h"
 #include "types/impl_var.h"
 #include "types/impl_def_val.h"
-#include "types/const_type.h"
 #include "types/const.h"
 #include "types/impl_arg.h"
 #include "types/impl_func.h"
+#include "types/number.h"
 #include "types/num_exp.h"
 #include "types/decl_enum_item.h"
 #include "types/decl_enum.h"
@@ -54,12 +55,17 @@
 #include "types/set_exp.h"
 #include "types/set_stmt.h"
 #include "types/return_stmt.h"
+#include "types/return_exp.h"
 #include "types/free_stmt.h"
 #include "types/impl.h"
 #include "types/decl_file.h"
 #include "types/free_exp.h"
 #include "types/free_stmt.h"
+#include "types/assert_stmt.h"
 #include "types/layout.h"
+#include "types/cpp_exp.h"
+#include "types/cpp_macro_call.h"
+#include "types/cpp_macro_decl.h"
 
 static inline impl_val *deref_impl_val(impl_val *ret_val, struct psi_decl_var *var) {
        unsigned i;
@@ -93,7 +99,8 @@ static inline impl_val *enref_impl_val(void *ptr, struct psi_decl_var *var) {
                return ptr;
        }
 
-       val = val_ptr = calloc(var->pointer_level + 1, sizeof(void *));
+       val = calloc(var->pointer_level + 1, sizeof(void *));
+       val_ptr = val;
        for (i = !var->arg->var->array_size; i < var->pointer_level; ++i) {
 #if 0
                fprintf(stderr, "++\n");