From 87151c8a7becf95c8ffd228ec2bf5eccaf355026 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 16 Mar 2012 02:28:44 +0100 Subject: [PATCH] Use RB_GENERATE_STATIC, not RB_GENERATE_INTERNAL. --- src/unix/linux/inotify.c | 3 +-- src/uv-common.c | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/unix/linux/inotify.c b/src/unix/linux/inotify.c index 2e905685..52b086c8 100644 --- a/src/unix/linux/inotify.c +++ b/src/unix/linux/inotify.c @@ -132,8 +132,7 @@ static int compare_watchers(const uv_fs_event_t* a, const uv_fs_event_t* b) { } -RB_GENERATE_INTERNAL(uv__inotify_watchers, uv_fs_event_s, node, compare_watchers, - inline static __attribute__((unused))) +RB_GENERATE_STATIC(uv__inotify_watchers, uv_fs_event_s, node, compare_watchers) void uv__inotify_loop_init(uv_loop_t* loop) { diff --git a/src/uv-common.c b/src/uv-common.c index d0241dcd..2e424a9c 100644 --- a/src/uv-common.c +++ b/src/uv-common.c @@ -32,10 +32,6 @@ #include "ares/inet_net_pton.h" #include "ares/inet_ntop.h" -#if !defined(__GNUC__) && !defined(__clang__) -# define __attribute__(x) -#endif - size_t uv_strlcpy(char* dst, const char* src, size_t size) { size_t n; @@ -191,8 +187,7 @@ static int cmp_ares_tasks(const uv_ares_task_t* a, const uv_ares_task_t* b) { } -RB_GENERATE_INTERNAL(uv__ares_tasks, uv_ares_task_s, node, cmp_ares_tasks, - inline static __attribute__((unused))) +RB_GENERATE_STATIC(uv__ares_tasks, uv_ares_task_s, node, cmp_ares_tasks) /* add ares handle to list */