From 42095c85a03af4912a7c76df006088697f1350f1 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 3 Apr 2012 02:40:07 +0200 Subject: [PATCH] Remove UV_ARES_TASK_PRIVATE_FIELDS. It's only used internally, it doesn't have to be part of a public header file. --- include/uv-private/uv-unix.h | 5 ----- include/uv-private/uv-win.h | 7 ------- src/uv-common.h | 12 +++++++++++- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/include/uv-private/uv-unix.h b/include/uv-private/uv-unix.h index 798be5e0..4a55ad88 100644 --- a/include/uv-private/uv-unix.h +++ b/include/uv-private/uv-unix.h @@ -182,11 +182,6 @@ typedef void* uv_lib_t; ev_timer timer_watcher; \ uv_timer_cb timer_cb; -#define UV_ARES_TASK_PRIVATE_FIELDS \ - int sock; \ - ev_io read_watcher; \ - ev_io write_watcher; - #define UV_GETADDRINFO_PRIVATE_FIELDS \ uv_getaddrinfo_cb cb; \ struct addrinfo* hints; \ diff --git a/include/uv-private/uv-win.h b/include/uv-private/uv-win.h index 812b2741..ee0fd6bb 100644 --- a/include/uv-private/uv-win.h +++ b/include/uv-private/uv-win.h @@ -390,13 +390,6 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s); uv_handle_t* endgame_next; \ unsigned int flags; -#define UV_ARES_TASK_PRIVATE_FIELDS \ - struct uv_req_s ares_req; \ - SOCKET sock; \ - HANDLE h_wait; \ - WSAEVENT h_event; \ - HANDLE h_close_event; - #define UV_GETADDRINFO_PRIVATE_FIELDS \ struct uv_req_s getadddrinfo_req; \ uv_getaddrinfo_cb getaddrinfo_cb; \ diff --git a/src/uv-common.h b/src/uv-common.h index e1f16b6c..e82f5842 100644 --- a/src/uv-common.h +++ b/src/uv-common.h @@ -35,7 +35,17 @@ struct uv_ares_task_s { UV_HANDLE_FIELDS - UV_ARES_TASK_PRIVATE_FIELDS +#if _WIN32 + struct uv_req_s ares_req; + SOCKET sock; + HANDLE h_wait; + WSAEVENT h_event; + HANDLE h_close_event; +#else + int sock; + ev_io read_watcher; + ev_io write_watcher; +#endif RB_ENTRY(uv_ares_task_s) node; };