diff options
Diffstat (limited to 'include/my_tree.h')
| -rw-r--r-- | include/my_tree.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/my_tree.h b/include/my_tree.h index be55cc4231e..24bbdd54019 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -25,10 +25,10 @@ extern "C" { #define MAX_TREE_HEIGHT 64 #define ELEMENT_KEY(tree,element)\ -(tree->offset_to_key ? (void*)((byte*) element+tree->offset_to_key) :\ +(tree->offset_to_key ? (void*)((uchar*) element+tree->offset_to_key) :\ *((void**) (element+1))) -#define tree_set_pointer(element,ptr) *((byte **) (element+1))=((byte*) (ptr)) +#define tree_set_pointer(element,ptr) *((uchar **) (element+1))=((uchar*) (ptr)) #define TREE_NO_DUPS 1 @@ -39,19 +39,11 @@ typedef int (*tree_walk_action)(void *,element_count,void *); typedef enum { free_init, free_free, free_end } TREE_FREE; typedef void (*tree_element_free)(void*, TREE_FREE, void *); -#ifdef MSDOS -typedef struct st_tree_element { - struct st_tree_element *left,*right; - unsigned long count; - uchar colour; /* black is marked as 1 */ -} TREE_ELEMENT; -#else typedef struct st_tree_element { struct st_tree_element *left,*right; uint32 count:31, colour:1; /* black is marked as 1 */ } TREE_ELEMENT; -#endif /* MSDOS */ #define ELEMENT_CHILD(element, offs) (*(TREE_ELEMENT**)((char*)element + offs)) |