summaryrefslogtreecommitdiffhomepage
path: root/include/stc/clist.h
diff options
context:
space:
mode:
authorTyge Løvset <[email protected]>2022-01-01 19:51:03 +0100
committerTyge Løvset <[email protected]>2022-01-01 19:51:03 +0100
commit8134d0f62ebc659741131eb79cec4fdcf5f774f7 (patch)
tree4324409930c320fcedc98f25356caeccf4e578c0 /include/stc/clist.h
parent9eafcffc28cc8cc0ee273888c1af043ff4d685a4 (diff)
downloadSTC-modified-8134d0f62ebc659741131eb79cec4fdcf5f774f7.tar.gz
STC-modified-8134d0f62ebc659741131eb79cec4fdcf5f774f7.zip
Corrected linking macro settings.
Diffstat (limited to 'include/stc/clist.h')
-rw-r--r--include/stc/clist.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/stc/clist.h b/include/stc/clist.h
index e2ff694e..b9a3df24 100644
--- a/include/stc/clist.h
+++ b/include/stc/clist.h
@@ -185,7 +185,7 @@ _cx_memb(_get_mut)(_cx_self* self, i_valraw val) {
// -------------------------- IMPLEMENTATION -------------------------
-#if !defined(STC_HEADER) || defined(STC_IMPLEMENTATION) || defined(i_imp)
+#if !defined(STC_SHARED) || c_option(c_static) || defined(STC_IMPLEMENTATION)
#if !c_option(c_no_clone)
STC_DEF _cx_self
@@ -332,7 +332,8 @@ _cx_memb(_value_cmp)(const _cx_value* x, const _cx_value* y) {
#endif // TEMPLATE IMPLEMENTATION
-#if !defined(STC_HEADER) && !defined(CLIST_H_INCLUDED) || defined(i_imp) && i_imp == 2
+#if !defined(CLIST_H_INCLUDED) && \
+ (!defined(STC_SHARED) || c_option(c_static) || defined(STC_IMPLEMENTATION))
STC_DEF size_t
_clist_count(const clist_VOID* self) {
@@ -344,7 +345,6 @@ _clist_count(const clist_VOID* self) {
}
#if !c_option(c_no_cmp)
-
// Singly linked list Mergesort implementation by Simon Tatham. O(n*log n).
// https://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html
STC_DEF clist_VOID_node *