From b4fb97a0aaecdb6e3ff4dc9badc51dc12211c9a1 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 18 Jul 2010 01:47:52 -0600 Subject: Make DMNSN_PRTREE_B and internal types local to prtree.c. --- libdimension/prtree.c | 14 +++++++++++++- libdimension/prtree.h | 12 +----------- 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'libdimension') diff --git a/libdimension/prtree.c b/libdimension/prtree.c index 55bbf5c..4e6131b 100644 --- a/libdimension/prtree.c +++ b/libdimension/prtree.c @@ -21,7 +21,17 @@ #include "dimension-impl.h" #include -typedef struct dmnsn_pseudo_prtree dmnsn_pseudo_prtree; +/* Number of children per node */ +#define DMNSN_PRTREE_B 6 + +struct dmnsn_prtree_node { + dmnsn_bounding_box bounding_box; + + /* Children (objects or subtrees) */ + bool is_leaf; + void *children[DMNSN_PRTREE_B]; + dmnsn_bounding_box bounding_boxes[DMNSN_PRTREE_B]; +}; typedef struct dmnsn_pseudo_prleaf { void *children[DMNSN_PRTREE_B]; @@ -29,6 +39,8 @@ typedef struct dmnsn_pseudo_prleaf { dmnsn_bounding_box bounding_box; } dmnsn_pseudo_prleaf; +typedef struct dmnsn_pseudo_prtree dmnsn_pseudo_prtree; + typedef struct dmnsn_pseudo_prnode { dmnsn_pseudo_prtree *left, *right; dmnsn_pseudo_prleaf children[6]; diff --git a/libdimension/prtree.h b/libdimension/prtree.h index 7848879..7ab616d 100644 --- a/libdimension/prtree.h +++ b/libdimension/prtree.h @@ -30,17 +30,7 @@ #include -/* Number of children per node */ -#define DMNSN_PRTREE_B 6 - -typedef struct dmnsn_prtree_node { - dmnsn_bounding_box bounding_box; - - /* Children (objects or subtrees) */ - bool is_leaf; - void *children[DMNSN_PRTREE_B]; - dmnsn_bounding_box bounding_boxes[DMNSN_PRTREE_B]; -} dmnsn_prtree_node; +typedef struct dmnsn_prtree_node dmnsn_prtree_node; typedef struct dmnsn_prtree { dmnsn_bounding_box bounding_box; -- cgit v1.2.3