summaryrefslogtreecommitdiffhomepage
path: root/stc
diff options
context:
space:
mode:
authorTyge Løvset <[email protected]>2020-08-16 13:56:53 +0200
committerTyge Løvset <[email protected]>2020-08-16 13:56:53 +0200
commit209bfe53ddea2e2d12b45996245babcdec5cdded (patch)
treed3a557da3ff61a9529c6fa61af256948ac91f510 /stc
parent744ebf56851b5c0f549e68b07d3fd9c9fda32925 (diff)
downloadSTC-modified-209bfe53ddea2e2d12b45996245babcdec5cdded.tar.gz
STC-modified-209bfe53ddea2e2d12b45996245babcdec5cdded.zip
Fixed comparison in inits.c. Added iterator in bits.c example.
Diffstat (limited to 'stc')
-rw-r--r--stc/cbitset.h8
-rw-r--r--stc/cdefs.h3
2 files changed, 5 insertions, 6 deletions
diff --git a/stc/cbitset.h b/stc/cbitset.h
index a88b1b86..4736f329 100644
--- a/stc/cbitset.h
+++ b/stc/cbitset.h
@@ -147,13 +147,13 @@ STC_INLINE cbitset_t cbitset_not(cbitset_t s1) {
cbitset_flip_all(&set); return set;
}
-struct cbitset_iter;
-typedef bool(*cbitset_cb)(struct cbitset_iter);
-typedef struct cbitset_iter {
+typedef struct cbitset_iter cbitset_iter_t;
+typedef bool(*cbitset_cb)(cbitset_iter_t);
+struct cbitset_iter {
cbitset_t *_bs;
cbitset_cb item, end;
size_t pos;
-} cbitset_iter_t;
+};
STC_INLINE bool cbitset_item(cbitset_iter_t it) {
return cbitset_test(*it._bs, it.pos);
diff --git a/stc/cdefs.h b/stc/cdefs.h
index f9867bce..5fc9cfc3 100644
--- a/stc/cdefs.h
+++ b/stc/cdefs.h
@@ -70,8 +70,7 @@
#define c_default_from_raw(x) (x)
#define c_default_to_raw(ptr) (*(ptr))
#define c_no_compare(x, y) (0)
-#define c_mem_compare(x, y) memcmp(x, y, sizeof(*(y)))
-#define c_mem_equals(x, y) (c_mem_compare(x, y) == 0)
+#define c_mem_equals(x, y) (memcmp(x, y, sizeof(*(y))) == 0)
#define c_default_equals(x, y) (*(x) == *(y))
#define c_default_less(x, y) (*(x) < *(y))
#define c_compare(less, x, y) (less(x, y) ? -1 : less(y, x))