Merge branch 'slimconfigure'

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

diff --git a/src/data.h b/src/data.h
index 5356a7ec43d858f8a2f1050a60a0f1291b81f4aa..88b892610222ae0c304ba2e4beb759fd62160652 100644 (file)
--- a/src/data.h
+++ b/src/data.h
@@ -29,6 +29,7 @@
 #include "types.h"
 #include "error.h"
 #include "plist.h"
+#include "validate.h"
 
 #define PSI_DEBUG 0x1
 #define PSI_SILENT 0x2
@@ -52,6 +53,7 @@
        struct psi_plist *unions; \
        struct psi_plist *enums; \
        struct psi_plist *decls; \
+       struct psi_plist *vars; \
        struct psi_plist *impls; \
        struct psi_plist *libs; \
        psi_error_cb error; \
@@ -66,7 +68,6 @@ struct psi_data {
 struct psi_data *psi_data_ctor(struct psi_data *data, psi_error_cb error, unsigned flags);
 struct psi_data *psi_data_ctor_with_dtors(struct psi_data *data, psi_error_cb error, unsigned flags);
 struct psi_data *psi_data_exchange(struct psi_data *dest, struct psi_data *src);
-bool psi_data_validate(struct psi_data *dst, struct psi_data *src);
 void psi_data_dtor(struct psi_data *data);
 void psi_data_dump(int fd, struct psi_data *data);