1 files changed, 8 insertions, 9 deletions

diff --git a/src/badlib.h b/src/badlib.h
index 25e4914..c47f2b9 100644
--- a/src/badlib.h
+++ b/src/badlib.h
@@ -20,7 +20,9 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <strings.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
 
 //
 // Basic types.
@@ -43,7 +45,7 @@ typedef ptrdiff_t sz;
 typedef uintptr_t ptrsize;
 typedef size_t usize;
 
-#define KB(N) ((sz)(N)*1024)
+#define KB(N) ((sz)(N) * 1024)
 #define MB(N) ((sz)KB(N) * 1024)
 #define GB(N) ((sz)MB(N) * 1024)
 #define TB(N) ((sz)GB(N) * 1024)
@@ -287,9 +289,9 @@ buf_pop(Buf *buf, void *dst, sz size) {
 typedef Array Str;
 
 // Create a string object from a C literal.
-#define cstr(s)               \
-    (Str) {                   \
-        (u8 *)(s), LEN(s) - 1 \
+#define cstr(s)                               \
+    (Str) {                                   \
+        .mem = (u8 *)(s), .size = LEN(s) - 1, \
     }
 
 // Create a string object from a char* array.
@@ -945,7 +947,7 @@ _int_eq(sz a, sz b) {
     return a == b;
 }
 
-bool
+u64
 _int_hash(sz a) {
     return a * UINT64_C(11400714819323198485);
 }
@@ -1235,9 +1237,6 @@ Allocator os_allocator = {
     .free = platform_free,
 };
 
-#include <time.h>
-#include <unistd.h>
-
 void
 platform_sleep(size_t microseconds) {
     usleep(microseconds);