Skip to content

Commit a1f28e2

Browse files
committed
Fix visibility issues under (mostly on win32)
Refs: libevent#511 Fixes: 7182c2f ("cmake: build SHARED and STATIC libraries (like autoconf does)") (cherry picked from commit ce3af53)
1 parent 6f74954 commit a1f28e2

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

include/event2/visibility.h

+2-12
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,15 @@
4040
# elif defined __GNUC__
4141
# define EVENT2_EXPORT_SYMBOL __attribute__ ((visibility("default")))
4242
# elif defined(_MSC_VER)
43-
# define EVENT2_EXPORT_SYMBOL extern __declspec(dllexport)
43+
# define EVENT2_EXPORT_SYMBOL __declspec(dllexport)
4444
# else
4545
# define EVENT2_EXPORT_SYMBOL /* unknown compiler */
4646
# endif
4747

4848
#else /* event_*_EXPORTS */
4949

50-
# if defined(_MSC_VER)
51-
# define EVENT2_EXPORT_SYMBOL extern __declspec(dllimport)
52-
# else
53-
# define EVENT2_EXPORT_SYMBOL
54-
# endif
50+
# define EVENT2_EXPORT_SYMBOL
5551

5652
#endif /* event_*_EXPORTS */
5753

58-
#if defined(_MSC_VER)
59-
# define EVENT2_EXPORT_SYMBOL_DECL __declspec(dllimport)
60-
#else
61-
# define EVENT2_EXPORT_SYMBOL_DECL extern
62-
#endif
63-
6454
#endif /* EVENT2_VISIBILITY_H_INCLUDED_ */

log-internal.h

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

5050
#ifdef EVENT_DEBUG_LOGGING_ENABLED
51-
EVENT2_EXPORT_SYMBOL_DECL
52-
ev_uint32_t event_debug_logging_mask_;
51+
EVENT2_EXPORT_SYMBOL extern ev_uint32_t event_debug_logging_mask_;
5352
#define event_debug_get_logging_mask_() (event_debug_logging_mask_)
5453
#else
5554
#define event_debug_get_logging_mask_() (0)

log.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ static event_fatal_cb fatal_fn = NULL;
6969
#define DEFAULT_MASK 0
7070
#endif
7171

72-
EVENT2_EXPORT_SYMBOL
73-
ev_uint32_t event_debug_logging_mask_ = DEFAULT_MASK;
72+
EVENT2_EXPORT_SYMBOL ev_uint32_t event_debug_logging_mask_ = DEFAULT_MASK;
7473
#endif /* EVENT_DEBUG_LOGGING_ENABLED */
7574

7675
void

0 commit comments

Comments
 (0)