From 89e250cd6329206907bd3257937944a8665a6547 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 25 Jul 2017 00:10:52 -0700 Subject: [PATCH] Avoid the name 'min' for a helper function Windows automatically defines min or something. --- src/runtime/tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime/tree.c b/src/runtime/tree.c index 644a5995..412b93ce 100644 --- a/src/runtime/tree.c +++ b/src/runtime/tree.c @@ -389,7 +389,7 @@ int ts_tree_compare(const Tree *left, const Tree *right) { return 0; } -static inline long min(long a, long b) { +static inline long min_byte(long a, long b) { return a <= b ? a : b; } @@ -479,7 +479,7 @@ void ts_tree_edit(Tree *self, const TSInputEdit *edit) { TSInputEdit child_edit = { .start_byte = 0, .bytes_added = 0, - .bytes_removed = min(remaining_bytes_to_delete, ts_tree_total_bytes(child)), + .bytes_removed = min_byte(remaining_bytes_to_delete, ts_tree_total_bytes(child)), .start_point = {0, 0}, .extent_added = {0, 0}, .extent_removed = point_min(remaining_extent_to_delete, ts_tree_total_size(child).extent),