diff options
| author | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2022-10-30 19:35:00 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2022-10-30 19:35:00 +0100 |
| commit | 3033986433a2a79a1578d6d424f89e439e0444ef (patch) | |
| tree | 1f9a12bfb94f12479d303df186c02fd7236d9b18 /include | |
| parent | fda4a6a8635254361196b0497803b7d01514203e (diff) | |
| parent | 0feeaa712b06f955dc7b721c81d4133732917cad (diff) | |
Merge branch 'release/debian/0.9.7+dfsg-1'debian/0.9.7+dfsg-1
Diffstat (limited to 'include')
| -rw-r--r-- | include/uriparser/Uri.h | 2 | ||||
| -rw-r--r-- | include/uriparser/UriBase.h | 28 |
2 files changed, 13 insertions, 17 deletions
diff --git a/include/uriparser/Uri.h b/include/uriparser/Uri.h index ea4a913..d2c8610 100644 --- a/include/uriparser/Uri.h +++ b/include/uriparser/Uri.h @@ -1,4 +1,4 @@ -/* 0beb20dace01f4b2fa24c3bf9f7e8e616f621e4697260805a2b63a4d190e64c0 (0.9.6+) +/* 4bf720e0ca97527a28e4c30f1c35b36a0b5f2697265c5ddc81080eaab4344ef2 (0.9.7+) * * uriparser - RFC 3986 URI parsing library * diff --git a/include/uriparser/UriBase.h b/include/uriparser/UriBase.h index 089c2c6..5216b1d 100644 --- a/include/uriparser/UriBase.h +++ b/include/uriparser/UriBase.h @@ -55,7 +55,7 @@ /* Version */ #define URI_VER_MAJOR 0 #define URI_VER_MINOR 9 -#define URI_VER_RELEASE 6 +#define URI_VER_RELEASE 7 #define URI_VER_SUFFIX_ANSI "" #define URI_VER_SUFFIX_UNICODE URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI) @@ -98,23 +98,19 @@ /* Import/export decorator */ -#if defined(URI_STATIC_BUILD) -# define URI_PUBLIC +#if defined(_MSC_VER) +# if defined(URI_STATIC_BUILD) +# define URI_PUBLIC +# elif defined(URI_LIBRARY_BUILD) +# define URI_PUBLIC __declspec(dllexport) +# else +# define URI_PUBLIC __declspec(dllimport) +# endif #else -# if defined(URI_LIBRARY_BUILD) -# if defined(_MSC_VER) -# define URI_PUBLIC __declspec(dllexport) -# elif defined(URI_VISIBILITY) -# define URI_PUBLIC __attribute__ ((visibility("default"))) -# else -# define URI_PUBLIC -# endif +# if ! defined(URI_LIBRARY_BUILD) || ! defined(URI_VISIBILITY) +# define URI_PUBLIC # else -# if defined(_MSC_VER) -# define URI_PUBLIC __declspec(dllimport) -# else -# define URI_PUBLIC -# endif +# define URI_PUBLIC __attribute__ ((visibility("default"))) # endif #endif |