Sink fixes, update for dependency changes

Signed-off-by: Andrew Opalach <andrew@akon.city>

2 files changed, 5 insertions, 5 deletions

diff --git a/src/fruits/cmsrv/ui.c b/src/fruits/cmsrv/ui.c
index e10db5e..e1e686f 100644
--- a/src/fruits/cmsrv/ui.c
+++ b/src/fruits/cmsrv/ui.c
@@ -109,7 +109,7 @@ static void erase_lists(struct cmsrv_ui *ui)
 static void putnwstr_maxwidth_yx(struct ncplane *n, u32 y, u32 x, u32 maxwidth, wstr *w)
 {
     ncplane_cursor_move_yx(n, y, x);
-    u32 end = AL_MIN(w->len, maxwidth);
+    u32 end = MIN(w->len, maxwidth);
     for (u32 i = 0; i < end; i++) {
         ncplane_putwc(n, al_wstr_at(w, i));
     }
@@ -127,10 +127,10 @@ static void render_lists(struct cmsrv_ui *ui)
     struct lia_list *list;
     al_array_foreach(ui->server->lists, i, list) {
         if (current_line++ >= max_height) break;
-        ncplane_putnstr_yx(n, i, 0, AL_MIN(max_width, list->name.len), &al_str_at(&list->name, 0));
-        s32 index = AL_MAX(list->current - (entries_per_list / 2), 0);
+        ncplane_putnstr_yx(n, i, 0, MIN(max_width, list->name.len), &al_str_at(&list->name, 0));
+        s32 index = MAX(list->current - (entries_per_list / 2), 0);
         s32 size = (s32)list->entries.size;
-        s32 end = AL_MIN(index + entries_per_list, size);
+        s32 end = MIN(index + entries_per_list, size);
         for (s32 j = index; j < end; j++) {
             struct lia_list_entry *entry = al_array_at(list->entries, j);
             u32 y = i + (j - index) + 1;
diff --git a/src/fruits/cmsrv/ui.h b/src/fruits/cmsrv/ui.h
index 45fdd85..ebf7c1a 100644
--- a/src/fruits/cmsrv/ui.h
+++ b/src/fruits/cmsrv/ui.h
@@ -1,6 +1,6 @@
-#include <notcurses/notcurses.h>
 #include <al/types.h>
 #include <al/array.h>
+#include <notcurses/notcurses.h>
 
 #include "../../server/server.h"