Henri Verbeet : include: Avoid _t-suffixes.
Alexandre Julliard
julliard at winehq.org
Thu Oct 18 15:02:37 CDT 2018
Module: vkd3d
Branch: master
Commit: 78c203b395b1fa4b5918cf881ebba8e9d47ae997
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=78c203b395b1fa4b5918cf881ebba8e9d47ae997
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Oct 18 18:02:31 2018 +0330
include: Avoid _t-suffixes.
The _t-suffix is reserved by POSIX.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/private/rbtree.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/private/rbtree.h b/include/private/rbtree.h
index 4c18f9c..7f44a0e 100644
--- a/include/private/rbtree.h
+++ b/include/private/rbtree.h
@@ -34,15 +34,15 @@ struct rb_entry
unsigned int flags;
};
-typedef int (*rb_compare_func_t)(const void *key, const struct rb_entry *entry);
+typedef int (*rb_compare_func)(const void *key, const struct rb_entry *entry);
struct rb_tree
{
- rb_compare_func_t compare;
+ rb_compare_func compare;
struct rb_entry *root;
};
-typedef void (rb_traverse_func_t)(struct rb_entry *entry, void *context);
+typedef void (rb_traverse_func)(struct rb_entry *entry, void *context);
#define RB_FLAG_RED 0x1
@@ -150,32 +150,32 @@ static inline struct rb_entry *rb_postorder_next(struct rb_entry *iter)
(elem) = (elem2))
-static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func_t *callback, void *context)
+static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func *callback, void *context)
{
struct rb_entry *iter, *next;
rb_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context);
}
-static inline void rb_init(struct rb_tree *tree, rb_compare_func_t compare)
+static inline void rb_init(struct rb_tree *tree, rb_compare_func compare)
{
tree->compare = compare;
tree->root = NULL;
}
-static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func_t *callback, void *context)
+static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func *callback, void *context)
{
struct rb_entry *iter;
rb_FOR_EACH(iter, tree) callback(iter, context);
}
-static inline void rb_clear(struct rb_tree *tree, rb_traverse_func_t *callback, void *context)
+static inline void rb_clear(struct rb_tree *tree, rb_traverse_func *callback, void *context)
{
/* Note that we use postorder here because the callback will likely free the entry. */
if (callback) rb_postorder(tree, callback, context);
tree->root = NULL;
}
-static inline void rb_destroy(struct rb_tree *tree, rb_traverse_func_t *callback, void *context)
+static inline void rb_destroy(struct rb_tree *tree, rb_traverse_func *callback, void *context)
{
rb_clear(tree, callback, context);
}
More information about the wine-cvs
mailing list