X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsplay_tree.h;h=b6727908053adc5352af8997904927f9a5d98cc8;hb=bcd1979454cd14087394f0c0a983205f6fbfcaf4;hp=8367ce71f7e3b210203693977029c911fb3db22b;hpb=1f8b70efa0dedbd3642e0ee82a640d125664af34;p=meshlink diff --git a/src/splay_tree.h b/src/splay_tree.h index 8367ce71..b6727908 100644 --- a/src/splay_tree.h +++ b/src/splay_tree.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_SPLAY_TREE_H +#define MESHLINK_SPLAY_TREE_H + /* splay_tree.h -- header file for splay_tree.c - Copyright (C) 2004-2012 Guus Sliepen + Copyright (C) 2014, 2017 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,10 +20,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -#ifndef __SPLAY_TREE_H__ -#define __SPLAY_TREE_H__ - typedef struct splay_node_t { /* Linked list part */ @@ -58,16 +57,16 @@ typedef struct splay_tree_t { splay_compare_t compare; splay_action_t delete; - int count; + unsigned int count; } splay_tree_t; /* (De)constructors */ -extern splay_tree_t *splay_alloc_tree(splay_compare_t, splay_action_t); +extern splay_tree_t *splay_alloc_tree(splay_compare_t, splay_action_t) __attribute__((__malloc__)); extern void splay_free_tree(splay_tree_t *); -extern splay_node_t *splay_alloc_node(void); +extern splay_node_t *splay_alloc_node(void) __attribute__((__malloc__)); extern void splay_free_node(splay_tree_t *tree, splay_node_t *); /* Insertion and deletion */