diff options
| author | Josh Gao <jmgao@google.com> | 2017-08-10 12:30:25 -0700 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2017-08-10 12:30:47 -0700 |
| commit | 83a0c9c65a60a92d3ea5542596b3ba56db492c37 (patch) | |
| tree | 64bb0c050c4db9ad9d721e05e3e199bfd02e60b0 /log-internal.h | |
| parent | af241a5c8c2cde0fab7d7d563276c1095b00e3b4 (diff) | |
| download | libevent-83a0c9c65a60a92d3ea5542596b3ba56db492c37.tar.gz | |
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
Diffstat (limited to 'log-internal.h')
| -rw-r--r-- | log-internal.h | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/log-internal.h b/log-internal.h index 330478a..211b3e1 100644 --- a/log-internal.h +++ b/log-internal.h @@ -24,8 +24,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef LOG_INTERNAL_H_INCLUDED_ -#define LOG_INTERNAL_H_INCLUDED_ +#ifndef _LOG_H_ +#define _LOG_H_ #include "event2/util.h" @@ -37,24 +37,7 @@ #define EV_NORETURN #endif -#define EVENT_ERR_ABORT_ ((int)0xdeaddead) - -#define USE_GLOBAL_FOR_DEBUG_LOGGING - -#if !defined(EVENT__DISABLE_DEBUG_MODE) || defined(USE_DEBUG) -#define EVENT_DEBUG_LOGGING_ENABLED -#endif - -#ifdef EVENT_DEBUG_LOGGING_ENABLED -#ifdef USE_GLOBAL_FOR_DEBUG_LOGGING -extern ev_uint32_t event_debug_logging_mask_; -#define event_debug_get_logging_mask_() (event_debug_logging_mask_) -#else -ev_uint32_t event_debug_get_logging_mask_(void); -#endif -#else -#define event_debug_get_logging_mask_() (0) -#endif +#define _EVENT_ERR_ABORT ((int)0xdeaddead) void event_err(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3) EV_NORETURN; void event_warn(const char *fmt, ...) EV_CHECK_FMT(1,2); @@ -63,19 +46,12 @@ void event_sock_warn(evutil_socket_t sock, const char *fmt, ...) EV_CHECK_FMT(2, void event_errx(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3) EV_NORETURN; void event_warnx(const char *fmt, ...) EV_CHECK_FMT(1,2); void event_msgx(const char *fmt, ...) EV_CHECK_FMT(1,2); -void event_debugx_(const char *fmt, ...) EV_CHECK_FMT(1,2); - -void event_logv_(int severity, const char *errstr, const char *fmt, va_list ap) - EV_CHECK_FMT(3,0); +void _event_debugx(const char *fmt, ...) EV_CHECK_FMT(1,2); -#ifdef EVENT_DEBUG_LOGGING_ENABLED -#define event_debug(x) do { \ - if (event_debug_get_logging_mask_()) { \ - event_debugx_ x; \ - } \ - } while (0) +#ifdef USE_DEBUG +#define event_debug(x) _event_debugx x #else -#define event_debug(x) ((void)0) +#define event_debug(x) do {;} while (0) #endif #undef EV_CHECK_FMT |