Improved warning, and other enhancements in ccommon.h

10 files changed, 15 insertions, 15 deletions

diff --git a/include/stc/algo/crange.h b/include/stc/algo/crange.h
index 45ef53a1..03162a2d 100644
--- a/include/stc/algo/crange.h
+++ b/include/stc/algo/crange.h
@@ -25,7 +25,7 @@
 #include <stc/algo/filter.h>
 #include <stc/algo/crange.h>
 
-int main()
+int main(void)
 {
     crange r1 = crange_make(80, 90);
     c_foreach (i, crange, r1)
diff --git a/include/stc/algo/filter.h b/include/stc/algo/filter.h
index f5de1811..4a227927 100644
--- a/include/stc/algo/filter.h
+++ b/include/stc/algo/filter.h
@@ -26,7 +26,7 @@
 #include <stc/cstack.h>
 #include <stc/calgo.h>
 
-int main()
+int main(void)
 {
     cstack_int stk = c_init(cstack_int, {1, 2, 3, 4, 5, 6, 7, 8, 9});
 
diff --git a/include/stc/algo/sort.h b/include/stc/algo/sort.h
index 01e7d521..06d7395f 100644
--- a/include/stc/algo/sort.h
+++ b/include/stc/algo/sort.h
@@ -31,7 +31,7 @@ template params:
 #define i_key int
 #include <stc/algo/sort.h>
 
-int main() {
+int main(void) {
     int nums[] = {23, 321, 5434, 25, 245, 1, 654, 33, 543, 21};
     
     intarray_sort_n(nums, c_arraylen(nums));
@@ -48,7 +48,7 @@ int main() {
 #include <stc/cdeq.h>
 #include <stc/algo/sort.h>
 
-int main() {
+int main(void) {
     IDeq nums = c_init(IDeq, {5434, 25, 245, 1, 654, 33, 543, 21});
     IDeq_push_front(&nums, 23);
     IDeq_push_front(&nums, 321);
diff --git a/include/stc/carc.h b/include/stc/carc.h
index b77b7dfb..9ba2ddd1 100644
--- a/include/stc/carc.h
+++ b/include/stc/carc.h
@@ -46,7 +46,7 @@ void Person_drop(Person* p) {
 #define i_opt c_no_cmp|c_no_hash  // exclude cmp, hash
 #include <stc/carc.h>
 
-int main() {
+int main(void) {
     ArcPers p = ArcPers_from(Person_make("John", "Smiths"));
     ArcPers q = ArcPers_clone(p); // share the pointer
 
@@ -225,4 +225,4 @@ STC_INLINE void _cx_MEMB(_assign)(_cx_Self* self, _cx_Self ptr) {
 #undef _i_atomic_inc
 #undef _i_atomic_dec_and_test
 #include "priv/template2.h"
-#undef _i_carc
\ No newline at end of file
+#undef _i_carc
diff --git a/include/stc/cbits.h b/include/stc/cbits.h
index 66bc6354..3b5785d3 100644
--- a/include/stc/cbits.h
+++ b/include/stc/cbits.h
@@ -26,7 +26,7 @@ Similar to boost::dynamic_bitset / std::bitset
 #include <stdio.h>
 #include "cbits.h"
 
-int main() {
+int main(void) {
     cbits bset = cbits_with_size(23, true);
     cbits_reset(&bset, 9);
     cbits_resize(&bset, 43, false);
diff --git a/include/stc/cbox.h b/include/stc/cbox.h
index 86d5a6a6..25d41b92 100644
--- a/include/stc/cbox.h
+++ b/include/stc/cbox.h
@@ -47,7 +47,7 @@ void Person_drop(Person* p) {
 #define i_no_cmp          // no cmp/hash is defined
 #include <stc/cbox.h>
 
-int main() {
+int main(void) {
     c_auto (PBox, p, q)
     {
         p = PBox_from(Person_from("John Smiths", "[email protected]"));
@@ -205,4 +205,4 @@ STC_INLINE void _cx_MEMB(_assign)(_cx_Self* self, _cx_Self* moved) {
         { return c_default_hash(&self->get); }
 #endif
 #include "priv/template2.h"
-#undef _i_cbox
\ No newline at end of file
+#undef _i_cbox
diff --git a/include/stc/ccommon.h b/include/stc/ccommon.h
index 45c3a360..1f9ea80d 100644
--- a/include/stc/ccommon.h
+++ b/include/stc/ccommon.h
@@ -85,7 +85,7 @@ typedef long long _llong;
   #define c_assert(expr)        assert(expr)
 #endif
 #define c_container_of(p, C, m) ((C*)((char*)(1 ? (p) : &((C*)0)->m) - offsetof(C, m)))
-#define c_const_cast(T, p)      ((T)(p) + 0*sizeof((T)0 == (p)))
+#define c_const_cast(T, p)      ((T)(1 ? (p) : (T)0))
 #define c_swap(T, xp, yp)       do { T *_xp = xp, *_yp = yp, \
                                     _tv = *_xp; *_xp = *_yp; *_yp = _tv; } while (0)
 #define c_sizeof                (intptr_t)sizeof
@@ -96,8 +96,8 @@ typedef long long _llong;
 #define c_memmove(d, s, ilen)   memmove(d, s, c_i2u(ilen))
 #define c_memset(d, val, ilen)  memset(d, val, c_i2u(ilen))
 #define c_memcmp(a, b, ilen)    memcmp(a, b, c_i2u(ilen))
-#define c_u2i(u)                ((intptr_t)((u) + 0*sizeof((u) == 1U)))
-#define c_i2u(i)                ((size_t)(i) + 0*sizeof((i) == 1))
+#define c_u2i(u)                ((intptr_t)(1 ? (u) : (size_t)1))
+#define c_i2u(i)                ((size_t)(1 ? (i) : (intptr_t)1))
 #define c_LTu(a, b)             ((size_t)(a) < (size_t)(b))
 
 // x and y are i_keyraw* type, defaults to i_key*:
diff --git a/include/stc/clist.h b/include/stc/clist.h
index 9cc1bb39..d7cf30b9 100644
--- a/include/stc/clist.h
+++ b/include/stc/clist.h
@@ -32,7 +32,7 @@
     #define i_tag ix
     #include <stc/clist.h>
 
-    int main()
+    int main(void)
     {
         c_auto (clist_ix, list)
         {
diff --git a/include/stc/crand.h b/include/stc/crand.h
index 89b681cd..0a6aa9e0 100644
--- a/include/stc/crand.h
+++ b/include/stc/crand.h
@@ -29,7 +29,7 @@
 // crand: Pseudo-random number generator
 #include "stc/crand.h"
 
-int main() {
+int main(void) {
     uint64_t seed = 123456789;
     crand_t rng = crand_init(seed);
     crand_unif_t dist1 = crand_unif_init(1, 6);
diff --git a/include/stc/cvec.h b/include/stc/cvec.h
index 9b95306e..d08e382f 100644
--- a/include/stc/cvec.h
+++ b/include/stc/cvec.h
@@ -44,7 +44,7 @@ struct MyStruct {
 #define i_tag i32
 #include <stc/cvec.h>
 
-int main() {
+int main(void) {
     cvec_i32 vec = {0};
     cvec_i32_push(&vec, 123);
     cvec_i32_drop(&vec);