diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-28 06:59:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-28 06:59:03 -0400 |
| commit | a8676b1edecee2d1d472b7f67dd026ef7b084a2f (patch) | |
| tree | d9ba30676becb8e03bbceaae9ba19a8288a2eb1d /src/or/connection.h | |
| parent | f0488551e7be4e2d21a104903a86be993a240398 (diff) | |
| parent | 47573038736b96e2a353a25ed3c788dcb77d8fcb (diff) | |
| download | tor-a8676b1edecee2d1d472b7f67dd026ef7b084a2f.tar.gz tor-a8676b1edecee2d1d472b7f67dd026ef7b084a2f.zip | |
Merge branch 'bug18902_squashed'
Diffstat (limited to 'src/or/connection.h')
| -rw-r--r-- | src/or/connection.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/or/connection.h b/src/or/connection.h index 4835235fba..4417b899f7 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -52,13 +52,13 @@ void connection_mark_for_close_internal_(connection_t *conn, * For all other cases, use connection_mark_and_flush() instead, which * checks for or_connection_t properly, instead. See below. */ -#define connection_mark_and_flush_internal_(c,line,file) \ - do { \ - connection_t *tmp_conn_ = (c); \ - connection_mark_for_close_internal_(tmp_conn_, (line), (file)); \ - tmp_conn_->hold_open_until_flushed = 1; \ - IF_HAS_BUFFEREVENT(tmp_conn_, \ - connection_start_writing(tmp_conn_)); \ +#define connection_mark_and_flush_internal_(c,line,file) \ + do { \ + connection_t *tmp_conn__ = (c); \ + connection_mark_for_close_internal_(tmp_conn__, (line), (file)); \ + tmp_conn__->hold_open_until_flushed = 1; \ + IF_HAS_BUFFEREVENT(tmp_conn__, \ + connection_start_writing(tmp_conn__)); \ } while (0) #define connection_mark_and_flush_internal(c) \ |