Skip to content

Commit cd285e4

Browse files
committed
Fix event_debug_logging_mask_ exporting on win32
1 parent 1771ec0 commit cd285e4

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

include/event2/visibility.h

+12
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,16 @@
5151

5252
#endif /* event_*_EXPORTS */
5353

54+
/** We need to dllimport event_debug_logging_mask_ into event_extra */
55+
#if defined(_MSC_VER)
56+
# if defined(event_core_shared_EXPORTS) /** from core export */
57+
# define EVENT2_CORE_EXPORT_SYMBOL __declspec(dllexport)
58+
# elif defined(event_extra_shared_EXPORTS) /** from extra import */
59+
# define EVENT2_CORE_EXPORT_SYMBOL __declspec(dllimport)
60+
# endif
61+
#endif /* _MSC_VER */
62+
#if !defined(EVENT2_CORE_EXPORT_SYMBOL)
63+
# define EVENT2_CORE_EXPORT_SYMBOL EVENT2_EXPORT_SYMBOL
64+
#endif
65+
5466
#endif /* EVENT2_VISIBILITY_H_INCLUDED_ */

log-internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extern "C" {
4848
#endif
4949

5050
#ifdef EVENT_DEBUG_LOGGING_ENABLED
51-
EVENT2_EXPORT_SYMBOL extern ev_uint32_t event_debug_logging_mask_;
51+
EVENT2_CORE_EXPORT_SYMBOL extern ev_uint32_t event_debug_logging_mask_;
5252
#define event_debug_get_logging_mask_() (event_debug_logging_mask_)
5353
#else
5454
#define event_debug_get_logging_mask_() (0)

0 commit comments

Comments
 (0)