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, 48 deletions

diff --git a/log.c b/log.c
index e8ae9fd..046e81f 100644
--- a/log.c
+++ b/log.c
@@ -38,9 +38,8 @@
  */
 
 #include "event2/event-config.h"
-#include "evconfig-private.h"
 
-#ifdef _WIN32
+#ifdef WIN32
 #include <winsock2.h>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -57,38 +56,13 @@
 
 #include "log-internal.h"
 
+static void _warn_helper(int severity, const char *errstr, const char *fmt,
+    va_list ap);
 static void event_log(int severity, const char *msg);
 static void event_exit(int errcode) EV_NORETURN;
 
 static event_fatal_cb fatal_fn = NULL;
 
-#ifdef EVENT_DEBUG_LOGGING_ENABLED
-#ifdef USE_DEBUG
-#define DEFAULT_MASK EVENT_DBG_ALL
-#else
-#define DEFAULT_MASK 0
-#endif
-
-#ifdef USE_GLOBAL_FOR_DEBUG_LOGGING
-ev_uint32_t event_debug_logging_mask_ = DEFAULT_MASK;
-#else
-static ev_uint32_t event_debug_logging_mask_ = DEFAULT_MASK;
-ev_uint32_t
-event_debug_get_logging_mask_(void)
-{
-	return event_debug_logging_mask_;
-}
-#endif
-#endif /* EVENT_DEBUG_LOGGING_ENABLED */
-
-void
-event_enable_debug_logging(ev_uint32_t which)
-{
-#ifdef EVENT_DEBUG_LOGGING_ENABLED
-	event_debug_logging_mask_ = which;
-#endif
-}
-
 void
 event_set_fatal_callback(event_fatal_cb cb)
 {
@@ -101,7 +75,7 @@ event_exit(int errcode)
 	if (fatal_fn) {
 		fatal_fn(errcode);
 		exit(errcode); /* should never be reached */
-	} else if (errcode == EVENT_ERR_ABORT_)
+	} else if (errcode == _EVENT_ERR_ABORT)
 		abort();
 	else
 		exit(errcode);
@@ -113,7 +87,7 @@ event_err(int eval, const char *fmt, ...)
 	va_list ap;
 
 	va_start(ap, fmt);
-	event_logv_(EVENT_LOG_ERR, strerror(errno), fmt, ap);
+	_warn_helper(_EVENT_LOG_ERR, strerror(errno), fmt, ap);
 	va_end(ap);
 	event_exit(eval);
 }
@@ -124,7 +98,7 @@ event_warn(const char *fmt, ...)
 	va_list ap;
 
 	va_start(ap, fmt);
-	event_logv_(EVENT_LOG_WARN, strerror(errno), fmt, ap);
+	_warn_helper(_EVENT_LOG_WARN, strerror(errno), fmt, ap);
 	va_end(ap);
 }
 
@@ -135,7 +109,7 @@ event_sock_err(int eval, evutil_socket_t sock, const char *fmt, ...)
 	int err = evutil_socket_geterror(sock);
 
 	va_start(ap, fmt);
-	event_logv_(EVENT_LOG_ERR, evutil_socket_error_to_string(err), fmt, ap);
+	_warn_helper(_EVENT_LOG_ERR, evutil_socket_error_to_string(err), fmt, ap);
 	va_end(ap);
 	event_exit(eval);
 }
@@ -147,7 +121,7 @@ event_sock_warn(evutil_socket_t sock, const char *fmt, ...)
 	int err = evutil_socket_geterror(sock);
 
 	va_start(ap, fmt);
-	event_logv_(EVENT_LOG_WARN, evutil_socket_error_to_string(err), fmt, ap);
+	_warn_helper(_EVENT_LOG_WARN, evutil_socket_error_to_string(err), fmt, ap);
 	va_end(ap);
 }
 
@@ -157,7 +131,7 @@ event_errx(int eval, const char *fmt, ...)
 	va_list ap;
 
 	va_start(ap, fmt);
-	event_logv_(EVENT_LOG_ERR, NULL, fmt, ap);
+	_warn_helper(_EVENT_LOG_ERR, NULL, fmt, ap);
 	va_end(ap);
 	event_exit(eval);
 }
@@ -168,7 +142,7 @@ event_warnx(const char *fmt, ...)
 	va_list ap;
 
 	va_start(ap, fmt);
-	event_logv_(EVENT_LOG_WARN, NULL, fmt, ap);
+	_warn_helper(_EVENT_LOG_WARN, NULL, fmt, ap);
 	va_end(ap);
 }
 
@@ -178,29 +152,26 @@ event_msgx(const char *fmt, ...)
 	va_list ap;
 
 	va_start(ap, fmt);
-	event_logv_(EVENT_LOG_MSG, NULL, fmt, ap);
+	_warn_helper(_EVENT_LOG_MSG, NULL, fmt, ap);
 	va_end(ap);
 }
 
 void
-event_debugx_(const char *fmt, ...)
+_event_debugx(const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	event_logv_(EVENT_LOG_DEBUG, NULL, fmt, ap);
+	_warn_helper(_EVENT_LOG_DEBUG, NULL, fmt, ap);
 	va_end(ap);
 }
 
-void
-event_logv_(int severity, const char *errstr, const char *fmt, va_list ap)
+static void
+_warn_helper(int severity, const char *errstr, const char *fmt, va_list ap)
 {
 	char buf[1024];
 	size_t len;
 
-	if (severity == EVENT_LOG_DEBUG && !event_debug_get_logging_mask_())
-		return;
-
 	if (fmt != NULL)
 		evutil_vsnprintf(buf, sizeof(buf), fmt, ap);
 	else
@@ -232,16 +203,16 @@ event_log(int severity, const char *msg)
 	else {
 		const char *severity_str;
 		switch (severity) {
-		case EVENT_LOG_DEBUG:
+		case _EVENT_LOG_DEBUG:
 			severity_str = "debug";
 			break;
-		case EVENT_LOG_MSG:
+		case _EVENT_LOG_MSG:
 			severity_str = "msg";
 			break;
-		case EVENT_LOG_WARN:
+		case _EVENT_LOG_WARN:
 			severity_str = "warn";
 			break;
-		case EVENT_LOG_ERR:
+		case _EVENT_LOG_ERR:
 			severity_str = "err";
 			break;
 		default: