Try to fix macos build

diff --git a/src/dynarray.c b/src/dynarray.c
index 4b2aa9c3d07a5316839830debf079ad21834db87..5b1a3fff8c528ae5b38c4e6cb301db1b907ce4c0 100644 (file)
--- a/src/dynarray.c
+++ b/src/dynarray.c
@@ -12,7 +12,7 @@
 void *dynarray_pointer_at(Dynarray *dynarray, size_t index)
 {
     trace_assert(index < dynarray->count);
-    return dynarray->data + index * dynarray->element_size;
+    return (uint8_t *)dynarray->data + index * dynarray->element_size;
 }
 
 void dynarray_clear(Dynarray *dynarray)
@@ -82,8 +82,8 @@ void dynarray_delete_at(Dynarray *dynarray, size_t index)
     trace_assert(dynarray);
     trace_assert(index < dynarray->count);
     memmove(
-        dynarray->data + index * dynarray->element_size,
-        dynarray->data + (index + 1) * dynarray->element_size,
+        (uint8_t *) dynarray->data + index * dynarray->element_size,
+        (uint8_t *) dynarray->data + (index + 1) * dynarray->element_size,
         dynarray->element_size * (dynarray->count - index - 1));
     dynarray->count--;
 }
@@ -97,12 +97,12 @@ void dynarray_insert_before(Dynarray *dynarray, size_t index, void *element)
     dynarray_grow(dynarray);
 
     memmove(
-        dynarray->data + (index + 1) * dynarray->element_size,
-        dynarray->data + index * dynarray->element_size,
+        (uint8_t*) dynarray->data + (index + 1) * dynarray->element_size,
+        (uint8_t*) dynarray->data + index * dynarray->element_size,
         dynarray->element_size * (dynarray->count - index));
 
     memcpy(
-        dynarray->data + index * dynarray->element_size,
+        (uint8_t*) dynarray->data + index * dynarray->element_size,
         element,
         dynarray->element_size);
 
@@ -139,7 +139,7 @@ void dynarray_pop(Dynarray *dynarray, void *element)
     if (element) {
         memcpy(
             element,
-            dynarray->data + dynarray->count * dynarray->element_size,
+            (uint8_t*) dynarray->data + dynarray->count * dynarray->element_size,
             dynarray->element_size);
     }
 }
@@ -151,7 +151,7 @@ void dynarray_replace_at(Dynarray *dynarray, size_t index, void *element)
     trace_assert(index < dynarray->count);
 
     memcpy(
-        dynarray->data + index * dynarray->element_size,
+        (uint8_t*) dynarray->data + index * dynarray->element_size,
         element,
         dynarray->element_size);
 }
@@ -162,7 +162,7 @@ void dynarray_copy_to(Dynarray *dynarray, void *dest, size_t index)
     trace_assert(dest);
     trace_assert(index < dynarray->count);
 
-    memcpy(dest, dynarray->data + index * dynarray->element_size, dynarray->element_size);
+    memcpy(dest, (uint8_t*) dynarray->data + index * dynarray->element_size, dynarray->element_size);
 }
 
 void dynarray_swap(Dynarray *dynarray, size_t i, size_t j)

diff --git a/src/dynarray.h b/src/dynarray.h
index 8832d82a9199624735f0fc81613aedb3d4663f07..dcd1fd237c06d3d05f7d900bbdf8acc47b1623cb 100644 (file)
--- a/src/dynarray.h
+++ b/src/dynarray.h
@@ -9,7 +9,7 @@ typedef struct {
     size_t element_size;
     size_t capacity;
     size_t count;
-    uint8_t *data;
+    void *data;
 } Dynarray;
 
 static inline