Changed internal rep of cvec. May now be initialized with {NULL} as default.

1 files changed, 9 insertions, 17 deletions

diff --git a/include/stc/forward.h b/include/stc/forward.h
index ffec50de..3930d91a 100644
--- a/include/stc/forward.h
+++ b/include/stc/forward.h
@@ -188,32 +188,24 @@ typedef union {
         SELF##_size_t root, disp, head, size, cap; \
     } SELF
 #endif
-#define _c_cstack_types(SELF, VAL) \
-    typedef VAL SELF##_value; \
-    typedef struct { SELF##_value *ref, *end; } SELF##_iter; \
-    typedef struct SELF { \
-        SELF##_value* data; \
-        size_t _len, _cap; \
-    } SELF
 
 #define _c_cstack_fixed(SELF, VAL, CAP) \
     typedef VAL SELF##_value; \
     typedef struct { SELF##_value *ref, *end; } SELF##_iter; \
-    typedef struct SELF { \
-        SELF##_value data[CAP]; \
-        size_t _len; \
-    } SELF
+    typedef struct { SELF##_value data[CAP]; size_t _len; } SELF
 
-#define _c_cpque_types(SELF, VAL) \
+#define _c_cstack_types(SELF, VAL) \
     typedef VAL SELF##_value; \
-    typedef struct SELF { \
-        SELF##_value* data; \
-        size_t _len, _cap; \
-    } SELF
+    typedef struct { SELF##_value *ref, *end; } SELF##_iter; \
+    typedef struct { SELF##_value* data; size_t _len, _cap; } SELF
 
 #define _c_cvec_types(SELF, VAL) \
     typedef VAL SELF##_value; \
     typedef struct { SELF##_value *ref, *end; } SELF##_iter; \
-    typedef struct { SELF##_value *data; } SELF
+    typedef struct { SELF##_value *data; size_t _len, _cap; } SELF
+
+#define _c_cpque_types(SELF, VAL) \
+    typedef VAL SELF##_value; \
+    typedef struct { SELF##_value* data; size_t _len, _cap; } SELF
 
 #endif // STC_FORWARD_H_INCLUDED