Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?"android-o-iot-preview-5o-iot-preview-5

This reverts commits 2a572d125a91a4aafd3ad8ce87259fc640fa0763 and
af241a5c8c2cde0fab7d7d563276c1095b00e3b4, which break tombstoned.

Bug: http://b/64543673
Test: manual + treehugger

1 files changed, 19 insertions, 20 deletions

diff --git a/buffer_iocp.c b/buffer_iocp.c
index 2d76a90..5d5303e 100644
--- a/buffer_iocp.c
+++ b/buffer_iocp.c
@@ -30,13 +30,12 @@
    This module implements overlapped read and write functions for evbuffer
    objects on Windows.
 */
-#include "event2/event-config.h"
-#include "evconfig-private.h"
 
 #include "event2/buffer.h"
 #include "event2/buffer_compat.h"
 #include "event2/util.h"
 #include "event2/thread.h"
+#include "event2/event-config.h"
 #include "util-internal.h"
 #include "evthread-internal.h"
 #include "evbuffer-internal.h"
@@ -88,13 +87,13 @@ pin_release(struct evbuffer_overlapped *eo, unsigned flag)
 	for (i = 0; i < eo->n_buffers; ++i) {
 		EVUTIL_ASSERT(chain);
 		next = chain->next;
-		evbuffer_chain_unpin_(chain, flag);
+		_evbuffer_chain_unpin(chain, flag);
 		chain = next;
 	}
 }
 
 void
-evbuffer_commit_read_(struct evbuffer *evbuf, ev_ssize_t nBytes)
+evbuffer_commit_read(struct evbuffer *evbuf, ev_ssize_t nBytes)
 {
 	struct evbuffer_overlapped *buf = upcast_evbuffer(evbuf);
 	struct evbuffer_chain **chainp;
@@ -129,13 +128,13 @@ evbuffer_commit_read_(struct evbuffer *evbuf, ev_ssize_t nBytes)
 	evbuf->total_len += nBytes;
 	evbuf->n_add_for_cb += nBytes;
 
-	evbuffer_invoke_callbacks_(evbuf);
+	evbuffer_invoke_callbacks(evbuf);
 
-	evbuffer_decref_and_unlock_(evbuf);
+	_evbuffer_decref_and_unlock(evbuf);
 }
 
 void
-evbuffer_commit_write_(struct evbuffer *evbuf, ev_ssize_t nBytes)
+evbuffer_commit_write(struct evbuffer *evbuf, ev_ssize_t nBytes)
 {
 	struct evbuffer_overlapped *buf = upcast_evbuffer(evbuf);
 
@@ -145,11 +144,11 @@ evbuffer_commit_write_(struct evbuffer *evbuf, ev_ssize_t nBytes)
 	evbuffer_drain(evbuf, nBytes);
 	pin_release(buf,EVBUFFER_MEM_PINNED_W);
 	buf->write_in_progress = 0;
-	evbuffer_decref_and_unlock_(evbuf);
+	_evbuffer_decref_and_unlock(evbuf);
 }
 
 struct evbuffer *
-evbuffer_overlapped_new_(evutil_socket_t fd)
+evbuffer_overlapped_new(evutil_socket_t fd)
 {
 	struct evbuffer_overlapped *evo;
 
@@ -157,7 +156,7 @@ evbuffer_overlapped_new_(evutil_socket_t fd)
 	if (!evo)
 		return NULL;
 
-	LIST_INIT(&evo->buffer.callbacks);
+	TAILQ_INIT(&evo->buffer.callbacks);
 	evo->buffer.refcnt = 1;
 	evo->buffer.last_with_datap = &evo->buffer.first;
 
@@ -168,7 +167,7 @@ evbuffer_overlapped_new_(evutil_socket_t fd)
 }
 
 int
-evbuffer_launch_write_(struct evbuffer *buf, ev_ssize_t at_most,
+evbuffer_launch_write(struct evbuffer *buf, ev_ssize_t at_most,
 		struct event_overlapped *ol)
 {
 	struct evbuffer_overlapped *buf_o = upcast_evbuffer(buf);
@@ -204,7 +203,7 @@ evbuffer_launch_write_(struct evbuffer *buf, ev_ssize_t at_most,
 	for (i=0; i < MAX_WSABUFS && chain; ++i, chain=chain->next) {
 		WSABUF *b = &buf_o->buffers[i];
 		b->buf = (char*)( chain->buffer + chain->misalign );
-		evbuffer_chain_pin_(chain, EVBUFFER_MEM_PINNED_W);
+		_evbuffer_chain_pin(chain, EVBUFFER_MEM_PINNED_W);
 
 		if ((size_t)at_most > chain->off) {
 			/* XXXX Cast is safe for now, since win32 has no
@@ -221,7 +220,7 @@ evbuffer_launch_write_(struct evbuffer *buf, ev_ssize_t at_most,
 	}
 
 	buf_o->n_buffers = i;
-	evbuffer_incref_(buf);
+	_evbuffer_incref(buf);
 	if (WSASend(buf_o->fd, buf_o->buffers, i, &bytesSent, 0,
 		&ol->overlapped, NULL)) {
 		int error = WSAGetLastError();
@@ -242,7 +241,7 @@ done:
 }
 
 int
-evbuffer_launch_read_(struct evbuffer *buf, size_t at_most,
+evbuffer_launch_read(struct evbuffer *buf, size_t at_most,
 		struct event_overlapped *ol)
 {
 	struct evbuffer_overlapped *buf_o = upcast_evbuffer(buf);
@@ -265,11 +264,11 @@ evbuffer_launch_read_(struct evbuffer *buf, size_t at_most,
 	buf_o->n_buffers = 0;
 	memset(buf_o->buffers, 0, sizeof(buf_o->buffers));
 
-	if (evbuffer_expand_fast_(buf, at_most, MAX_WSABUFS) == -1)
+	if (_evbuffer_expand_fast(buf, at_most, MAX_WSABUFS) == -1)
 		goto done;
 	evbuffer_freeze(buf, 0);
 
-	nvecs = evbuffer_read_setup_vecs_(buf, at_most,
+	nvecs = _evbuffer_read_setup_vecs(buf, at_most,
 	    vecs, MAX_WSABUFS, &chainp, 1);
 	for (i=0;i<nvecs;++i) {
 		WSABUF_FROM_EVBUFFER_IOV(
@@ -282,12 +281,12 @@ evbuffer_launch_read_(struct evbuffer *buf, size_t at_most,
 
 	npin=0;
 	for ( ; chain; chain = chain->next) {
-		evbuffer_chain_pin_(chain, EVBUFFER_MEM_PINNED_R);
+		_evbuffer_chain_pin(chain, EVBUFFER_MEM_PINNED_R);
 		++npin;
 	}
 	EVUTIL_ASSERT(npin == nvecs);
 
-	evbuffer_incref_(buf);
+	_evbuffer_incref(buf);
 	if (WSARecv(buf_o->fd, buf_o->buffers, nvecs, &bytesRead, &flags,
 		    &ol->overlapped, NULL)) {
 		int error = WSAGetLastError();
@@ -308,14 +307,14 @@ done:
 }
 
 evutil_socket_t
-evbuffer_overlapped_get_fd_(struct evbuffer *buf)
+_evbuffer_overlapped_get_fd(struct evbuffer *buf)
 {
 	struct evbuffer_overlapped *buf_o = upcast_evbuffer(buf);
 	return buf_o ? buf_o->fd : -1;
 }
 
 void
-evbuffer_overlapped_set_fd_(struct evbuffer *buf, evutil_socket_t fd)
+_evbuffer_overlapped_set_fd(struct evbuffer *buf, evutil_socket_t fd)
 {
 	struct evbuffer_overlapped *buf_o = upcast_evbuffer(buf);
 	EVBUFFER_LOCK(buf);