1.1 --- a/src/cx/tree.h Thu May 23 18:21:36 2024 +0200 1.2 +++ b/src/cx/tree.h Thu May 23 19:29:14 2024 +0200 1.3 @@ -58,10 +58,7 @@ 1.4 * @see CxIterator 1.5 */ 1.6 typedef struct cx_tree_iterator_s { 1.7 - /** 1.8 - * The base properties of this iterator. 1.9 - */ 1.10 - struct cx_iterator_base_s base; 1.11 + CX_ITERATOR_BASE 1.12 /** 1.13 * Indicates whether the subtree below the current node shall be skipped. 1.14 */ 1.15 @@ -97,7 +94,7 @@ 1.16 * Stores a copy of the next pointer of the visited node. 1.17 * Allows freeing a node on exit without corrupting the iteration. 1.18 */ 1.19 - void *next; 1.20 + void *node_next; 1.21 /** 1.22 * Internal stack. 1.23 * Will be automatically freed once the iterator becomes invalid. 1.24 @@ -157,10 +154,7 @@ 1.25 * @see CxIterator 1.26 */ 1.27 typedef struct cx_tree_visitor_s { 1.28 - /** 1.29 - * The base properties of this iterator. 1.30 - */ 1.31 - struct cx_iterator_base_s base; 1.32 + CX_ITERATOR_BASE 1.33 /** 1.34 * Indicates whether the subtree below the current node shall be skipped. 1.35 */