diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-11-24 15:40:44 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-11-24 23:41:22 +0000 |
| commit | b9c50236afedc270eab5f6095e449f8c37e91daa (patch) | |
| tree | e5e3779a3e9b4b912a2a130716cb802e3e0f1cc5 /epan/wmem | |
| parent | 2f73ac0c8c10c151ffe7529a63dbe7c82ee1c891 (diff) | |
Avoid colliding definitions of wmem_tree_t.
Change-Id: I643eae3c35f96591770ab03ce44a85c806f17e1c
Reviewed-on: https://code.wireshark.org/review/12119
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/wmem')
| -rw-r--r-- | epan/wmem/wmem_tree-int.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/wmem/wmem_tree-int.h b/epan/wmem/wmem_tree-int.h index 4ced1f3796..b53b9b889e 100644 --- a/epan/wmem/wmem_tree-int.h +++ b/epan/wmem/wmem_tree-int.h @@ -24,6 +24,7 @@ #ifndef __WMEM_TREE_INT_H__ #define __WMEM_TREE_INT_H__ +#include <epan/wmem/wmem_tree.h> #ifdef __cplusplus extern "C" { @@ -65,10 +66,6 @@ struct _wmem_tree_t { void (*post_rotation_cb)(wmem_tree_node_t *); }; -typedef struct _wmem_tree_t wmem_tree_t; - - - typedef int (*compare_func)(const void *a, const void *b); wmem_tree_node_t * |