From 3f21dd64d9192b5fa1cb2c79055161dda92b3890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 3 Aug 2016 11:46:05 +0100 Subject: [PATCH] win: remove ABI compatibility hacks PR-URL: https://github.com/libuv/libuv/pull/966 Reviewed-By: Ben Noordhuis Reviewed-By: Colin Ihrig Reviewed-By: Fedor Indutny --- include/uv-win.h | 11 ----------- src/win/tty.c | 2 -- 2 files changed, 13 deletions(-) diff --git a/include/uv-win.h b/include/uv-win.h index 8b538614..e9427f57 100644 --- a/include/uv-win.h +++ b/include/uv-win.h @@ -246,15 +246,6 @@ typedef union { CRITICAL_SECTION num_readers_lock_; HANDLE write_semaphore_; } state_; - /* TODO: remove me in v2.x. */ - struct { - SRWLOCK unused_; - } unused1_; - /* TODO: remove me in v2.x. */ - struct { - uv_mutex_t unused1_; - uv_mutex_t unused2_; - } unused2_; } uv_rwlock_t; typedef struct { @@ -478,8 +469,6 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s); union { \ struct { \ /* Used for readable TTY handles */ \ - /* TODO: remove me in v2.x. */ \ - HANDLE unused_; \ uv_buf_t read_line_buffer; \ HANDLE read_raw_wait; \ /* Fields used for translating win keystrokes into vt100 characters */ \ diff --git a/src/win/tty.c b/src/win/tty.c index 24f26056..0c20e6e4 100644 --- a/src/win/tty.c +++ b/src/win/tty.c @@ -183,8 +183,6 @@ int uv_tty_init(uv_loop_t* loop, uv_tty_t* tty, uv_file fd, int readable) { if (readable) { /* Initialize TTY input specific fields. */ tty->flags |= UV_HANDLE_TTY_READABLE | UV_HANDLE_READABLE; - /* TODO: remove me in v2.x. */ - tty->tty.rd.unused_ = NULL; tty->tty.rd.read_line_buffer = uv_null_buf_; tty->tty.rd.read_raw_wait = NULL;