diff options
| author | reggie@big_geek. <> | 2006-05-08 15:15:05 -0500 |
|---|---|---|
| committer | reggie@big_geek. <> | 2006-05-08 15:15:05 -0500 |
| commit | e815c4c9747c8643a48950bcc854170845c47628 (patch) | |
| tree | 45e25c571bea2101f73fff090266209606f600ae /include/my_tree.h | |
| parent | 792f7383ac7432a284b4a2dcacfeaa66988d71ec (diff) | |
| parent | 11d66e806836a1bb57b4709ca2b171a0c9dc9bd6 (diff) | |
| download | mariadb-git-e815c4c9747c8643a48950bcc854170845c47628.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into big_geek.:C:/Work/mysql/mysql-5.1
Diffstat (limited to 'include/my_tree.h')
| -rw-r--r-- | include/my_tree.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/my_tree.h b/include/my_tree.h index 03dc9d5c829..e9746ca1b2c 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -40,19 +40,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)) |