From 903167231f0e6ff7725c3bd6eae113b865d20439 Mon Sep 17 00:00:00 2001
From: Toby Jaffey <toby@ringtailsoftware.co.uk>
Date: Sat, 13 Dec 2025 15:52:27 +0000
Subject: [PATCH] Fix internal memcpy/memset to have standard libc prototypes

---
 uvm32/uvm32.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/uvm32/uvm32.c b/uvm32/uvm32.c
index 3e5ba3c..37423b3 100644
--- a/uvm32/uvm32.c
+++ b/uvm32/uvm32.c
@@ -48,22 +48,24 @@ static uint32_t garbage;
 
 #ifndef UVM32_MEMCPY
 #define UVM32_MEMCPY uvm32_memcpy
-void uvm32_memcpy(void *dst, const void *src, int len) {
+void *uvm32_memcpy(void *dst, const void *src, size_t len) {
     uint8_t *d = (uint8_t *)dst;
     const uint8_t *s = (const uint8_t *)src;
     while(len--) {
         *(d++) = *(s++);
     }
+    return dst;
 }
 #endif
 
 #ifndef UVM32_MEMSET
 #define UVM32_MEMSET uvm32_memset
-void uvm32_memset(void *buf, int c, int len) {
+void *uvm32_memset(void *buf, int c, size_t len) {
     uint8_t *b = (uint8_t *)buf;
     while(len--) {
         *(b++) = c;
     }
+    return buf;
 }
 #endif