diff options
| author | Azat Khuzhin <a3at.mail@gmail.com> | 2017-03-14 00:33:26 +0300 |
|---|---|---|
| committer | Azat Khuzhin <a3at.mail@gmail.com> | 2017-03-14 12:55:40 +0300 |
| commit | 92cf234b0c2eb41fbbac38b173723a4a58d3621b (patch) | |
| tree | 70e5cf43fd2902c85cdd5924db0a8f3765b15e62 /include | |
| parent | a9c2116facb523d318bd029358ca9090e77cfe23 (diff) | |
| download | libevent-92cf234b0c2eb41fbbac38b173723a4a58d3621b.tar.gz | |
log/win32: fix exporting extern variable
==> win: C:\vagrant\log.c(73): error C2370: 'event_debug_logging_mask_' : redefinition; different storage class [C:\vagrant\.cmake-vagrant\event_core_shared.vcxproj]
Diffstat (limited to 'include')
| -rw-r--r-- | include/event2/visibility.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/event2/visibility.h b/include/event2/visibility.h index 57ea3b76..af30905d 100644 --- a/include/event2/visibility.h +++ b/include/event2/visibility.h @@ -34,6 +34,7 @@ defined(event_core_shared_EXPORTS) || \ defined(event_pthreads_shared_EXPORTS) || \ defined(event_openssl_shared_EXPORTS) + # if defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550) # define EVENT2_EXPORT_SYMBOL __global # elif defined __GNUC__ @@ -43,12 +44,21 @@ # else # define EVENT2_EXPORT_SYMBOL /* unknown compiler */ # endif -#else + +#else /* event_*_EXPORTS */ + # if defined(_MSC_VER) # define EVENT2_EXPORT_SYMBOL extern __declspec(dllimport) # else # define EVENT2_EXPORT_SYMBOL # endif + +#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_ */ |