2 files changed, 8 insertions(+), 5 deletions(-)

M .gitignore
M src/server.c

@@ 2,4 2,5 @@
 
 obj/
 bin/
-test/cobble_tests>
\ No newline at end of file
+scripts/data/
+test/cobble_tests

@@ 29,7 29,7 @@ cbl_server_connect_cb(uev_t *w, void *arg, int events)
     TRY_E(cbl_client_connect(client));
 }
 
-static void
+static void*
 tick_thread_cb(void *data)
 {
     struct cbl_server *server = data;


@@ 59,7 59,8 @@ cbl_server_init(struct cbl_server *server)
 
     /* load in config */
     log_debug("Loading config...")
-    TRY_E(cbl_config_parse(&server->config, "cobble.cfg"));
+    /* NOTE: we cast away the const here */
+    TRY_E(cbl_config_parse((struct cbl_config*) &server->config, "cobble.cfg"));
 
     /* try and open the socket */
     server->fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);


@@ 69,7 70,8 @@ cbl_server_init(struct cbl_server *server)
     }
 
     /* no need to error check this */
-    setsockopt(server->fd, SOL_SOCKET, SO_REUSEADDR, 1, 1);
+    int on = 1;
+    setsockopt(server->fd, SOL_SOCKET, SO_REUSEADDR, &on, 1);
 
     /* set noblock */
     int flags = fcntl(server->fd, F_GETFL, 0);


@@ 141,7 143,7 @@ cbl_server_run(struct cbl_server *server)
         return E_FAILED;
     }
 
-    pthread_join(&server->tick_thread, NULL);
+    pthread_join(server->tick_thread, NULL);
 
     return E_SUCCESS;
 }=
\ No newline at end of file