Sink fixes, update for dependency changes

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

4 files changed, 7 insertions, 7 deletions

diff --git a/src/cache/backings/file.c b/src/cache/backings/file.c
index 153b1e4..a09d535 100644
--- a/src/cache/backings/file.c
+++ b/src/cache/backings/file.c
@@ -18,7 +18,7 @@ static void file_backing_write(struct cch_backing *backing, u8 *buf, off_t index
         al_assert(file->u.pointer == index);
     }
     if (file->size >= 0 && index + ((off_t)*size) >= file->size) {
-        *size = AL_MAX(file->size - index, 0);
+        *size = MAX(file->size - index, 0L);
     }
     aki_file_write(&file->file, buf, *size);
     file->u.pointer += *size;
@@ -35,7 +35,7 @@ static void file_backing_read(struct cch_backing *backing, u8 *buf, off_t index,
         al_assert(file->u.pointer == index);
     }
     if (file->size >= 0 && index + ((off_t)*size) >= file->size) {
-        *size = AL_MAX(file->size - index, 0);
+        *size = MAX(file->size - index, 0L);
     }
     aki_file_read(&file->file, buf, *size);
     file->u.pointer += *size;
diff --git a/src/cache/backings/file_mapped.c b/src/cache/backings/file_mapped.c
index 6c6fc94..22f9ae5 100644
--- a/src/cache/backings/file_mapped.c
+++ b/src/cache/backings/file_mapped.c
@@ -14,7 +14,7 @@ static void file_backing_write(struct cch_backing *backing, u8 *buf, off_t index
     struct cch_backing_file *file = (struct cch_backing_file *)backing;
     aki_mutex_lock(&file->mutex);
     if (file->size >= 0 && index + (off_t)*size >= file->size) {
-        *size = AL_MAX(file->size - index, 0);
+        *size = MAX(file->size - index, 0L);
     }
     al_memcpy(file->u.map + index, buf, *size);
     cch_backing_fill_range(&file->backing, index, *size);
@@ -26,7 +26,7 @@ static u8 *file_backing_get_ptr(struct cch_backing *backing, off_t index, size_t
     struct cch_backing_file *file = (struct cch_backing_file *)backing;
     aki_mutex_lock(&file->mutex);
     if (file->size >= 0 && index + (off_t)*size >= file->size) {
-        *size = AL_MAX(file->size - index, 0);
+        *size = MAX(file->size - index, 0L);
     }
     return (u8 *)(file->u.map + index);
 }
diff --git a/src/cache/backings/memory.c b/src/cache/backings/memory.c
index 1dca8f9..5db2063 100644
--- a/src/cache/backings/memory.c
+++ b/src/cache/backings/memory.c
@@ -21,7 +21,7 @@ static void memory_backing_write(struct cch_backing *backing, u8 *buf, off_t ind
     struct cch_backing_memory *mem = (struct cch_backing_memory *)backing;
     aki_mutex_lock(&mem->mutex);
     if (mem->size >= 0 && index + (off_t)*size >= mem->size) {
-        *size = AL_MAX(mem->size - index, 0);
+        *size = MAX(mem->size - index, 0L);
     }
     ensure_alloced(mem, index + *size);
     al_memcpy(mem->data + index, buf, *size);
@@ -34,7 +34,7 @@ static u8 *memory_backing_get_ptr(struct cch_backing *backing, off_t index, size
     struct cch_backing_memory *mem = (struct cch_backing_memory *)backing;
     aki_mutex_lock(&mem->mutex);
     if (mem->size >= 0 && index + (off_t)*size >= mem->size) {
-        *size = AL_MAX(mem->size - index, 0);
+        *size = MAX(mem->size - index, 0L);
     }
     return (u8 *)(mem->data + index);
 }
diff --git a/src/cache/range.h b/src/cache/range.h
index 598b655..603117e 100644
--- a/src/cache/range.h
+++ b/src/cache/range.h
@@ -13,7 +13,7 @@ static void cch_backing_fill_range(struct cch_backing *backing, off_t index, off
     struct cch_range *range;
     al_array_foreach_ptr(backing->available, i, range) {
         if (index >= range->start && index <= range->end) {
-            range->end = AL_MAX(index + size, range->end);
+            range->end = MAX(index + size, range->end);
             return;
         }
     }