From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Mon, 13 Mar 2017 19:33:38 +0000 (+0300)
Subject: log: remove USE_GLOBAL_FOR_DEBUG_LOGGING
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49dcf4d554bcec89814a26d620c0f37603dc35cd;p=libevent

log: remove USE_GLOBAL_FOR_DEBUG_LOGGING

Fixes: 9081b66c9c1446b11c0052bade799fafb460efed ("Export symbols for
-fvisibility=hidden (under cmake)")
---

diff --git a/log-internal.h b/log-internal.h
index e92fa88d..97d510fc 100644
--- a/log-internal.h
+++ b/log-internal.h
@@ -39,21 +39,15 @@
 
 #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
 EVENT2_EXPORT_SYMBOL
 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
 
diff --git a/log.c b/log.c
index e8ae9fdc..0bbee620 100644
--- a/log.c
+++ b/log.c
@@ -69,16 +69,7 @@ static event_fatal_cb fatal_fn = NULL;
 #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