cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-08-03 09:16:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix visibility issues under (mostly on win32)

Browse Source 
Refs: #511
Fixes: 7182c2f561570cd9ceb704623ebe9ae3608c7b43 ("cmake: build SHARED and
STATIC libraries (like autoconf does)")

(cherry picked from commit ce3af533f1b11c4b302d404483f28660eb5d7190)
This commit is contained in:
Azat Khuzhin 2017-05-29 15:04:50 +03:00 committed by Azat Khuzhin
parent 6f74954017
commit a1f28e2f9c
No known key found for this signature in database
GPG Key ID: B86086848EF8686D
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/event2/visibility.h
View File

@ -40,25 +40,15 @@
# elif defined __GNUC__ # elif defined __GNUC__
# define EVENT2_EXPORT_SYMBOL __attribute__ ((visibility("default"))) # define EVENT2_EXPORT_SYMBOL __attribute__ ((visibility("default")))
# elif defined(_MSC_VER) # elif defined(_MSC_VER)
# define EVENT2_EXPORT_SYMBOL extern __declspec(dllexport) # define EVENT2_EXPORT_SYMBOL __declspec(dllexport)
# else # else
# define EVENT2_EXPORT_SYMBOL /* unknown compiler */ # define EVENT2_EXPORT_SYMBOL /* unknown compiler */
# endif # endif
#else /* event_*_EXPORTS */ #else /* event_*_EXPORTS */
# if defined(_MSC_VER) # define EVENT2_EXPORT_SYMBOL
# define EVENT2_EXPORT_SYMBOL extern __declspec(dllimport)
# else
# define EVENT2_EXPORT_SYMBOL
# endif
#endif /* event_*_EXPORTS */ #endif /* event_*_EXPORTS */
#if defined(_MSC_VER)
# define EVENT2_EXPORT_SYMBOL_DECL __declspec(dllimport)
#else
# define EVENT2_EXPORT_SYMBOL_DECL extern
#endif
#endif /* EVENT2_VISIBILITY_H_INCLUDED_ */ #endif /* EVENT2_VISIBILITY_H_INCLUDED_ */

3
log-internal.h
View File

@ -48,8 +48,7 @@ extern "C" {
#endif #endif
#ifdef EVENT_DEBUG_LOGGING_ENABLED #ifdef EVENT_DEBUG_LOGGING_ENABLED
EVENT2_EXPORT_SYMBOL_DECL EVENT2_EXPORT_SYMBOL extern ev_uint32_t event_debug_logging_mask_;
ev_uint32_t event_debug_logging_mask_;
#define event_debug_get_logging_mask_() (event_debug_logging_mask_) #define event_debug_get_logging_mask_() (event_debug_logging_mask_)
#else #else
#define event_debug_get_logging_mask_() (0) #define event_debug_get_logging_mask_() (0)

3
log.c
View File

@ -69,8 +69,7 @@ static event_fatal_cb fatal_fn = NULL;
#define DEFAULT_MASK 0 #define DEFAULT_MASK 0
#endif #endif
EVENT2_EXPORT_SYMBOL EVENT2_EXPORT_SYMBOL ev_uint32_t event_debug_logging_mask_ = DEFAULT_MASK;
ev_uint32_t event_debug_logging_mask_ = DEFAULT_MASK;
#endif /* EVENT_DEBUG_LOGGING_ENABLED */ #endif /* EVENT_DEBUG_LOGGING_ENABLED */
void void