summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2022-09-08 09:02:07 -0400
committerDavid Robillard <d@drobilla.net>2022-09-08 09:02:07 -0400
commit46111484e2c5b611a15a77e6142c59465bcfd643 (patch)
tree9c87e5423ba87d24eaf87574652fceb7520f06f3
parent70b16298f30c8ca91032abbadead945f6ce8fa07 (diff)
downloadsord-46111484e2c5b611a15a77e6142c59465bcfd643.tar.gz
sord-46111484e2c5b611a15a77e6142c59465bcfd643.tar.bz2
sord-46111484e2c5b611a15a77e6142c59465bcfd643.zip
Fix accidentally exposed internal zix symbols
-rw-r--r--NEWS3
-rw-r--r--src/sord.c2
-rw-r--r--src/zix/common.h18
3 files changed, 13 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index 4bf5923..1fa11e6 100644
--- a/NEWS
+++ b/NEWS
@@ -2,8 +2,9 @@ sord (0.16.13) unstable; urgency=medium
* Adopt REUSE machine-readable licensing standard
* Allow programs to be used from subproject
+ * Fix accidentally exposed internal zix symbols
- -- David Robillard <d@drobilla.net> Thu, 01 Sep 2022 23:19:58 +0000
+ -- David Robillard <d@drobilla.net> Thu, 08 Sep 2022 13:01:44 +0000
sord (0.16.12) stable; urgency=medium
diff --git a/src/sord.c b/src/sord.c
index 66898d8..4d4836f 100644
--- a/src/sord.c
+++ b/src/sord.c
@@ -7,7 +7,7 @@
#include "serd/serd.h"
#include "sord/sord.h"
-#define ZIX_STATIC
+#define ZIX_API
#include "zix/btree.c"
#include "zix/btree.h"
#include "zix/common.h"
diff --git a/src/zix/common.h b/src/zix/common.h
index 46307b1..54f2303 100644
--- a/src/zix/common.h
+++ b/src/zix/common.h
@@ -12,14 +12,16 @@
*/
/** @cond */
-#if defined(_WIN32) && !defined(ZIX_STATIC) && defined(ZIX_INTERNAL)
-# define ZIX_API __declspec(dllexport)
-#elif defined(_WIN32) && !defined(ZIX_STATIC)
-# define ZIX_API __declspec(dllimport)
-#elif defined(__GNUC__)
-# define ZIX_API __attribute__((visibility("default")))
-#else
-# define ZIX_API
+#ifndef ZIX_API
+# if defined(_WIN32) && !defined(ZIX_STATIC) && defined(ZIX_INTERNAL)
+# define ZIX_API __declspec(dllexport)
+# elif defined(_WIN32) && !defined(ZIX_STATIC)
+# define ZIX_API __declspec(dllimport)
+# elif defined(__GNUC__)
+# define ZIX_API __attribute__((visibility("default")))
+# else
+# define ZIX_API
+# endif
#endif
#ifdef __GNUC__