From 72e37aa13a341fb63b458addaaf35157227cd10c Mon Sep 17 00:00:00 2001
From: Max Wash <max@doorstuck.net>
Date: Wed, 8 Jul 2020 19:10:50 +0100
Subject: [PATCH] Fixed some incorrect definitions

---
 photon/libc/include/machine/_stdint.h | 6 ++++++
 photon/libc/include/stddef.h          | 2 +-
 photon/libc/include/string.h          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/photon/libc/include/machine/_stdint.h b/photon/libc/include/machine/_stdint.h
index 4a510ed..266d323 100644
--- a/photon/libc/include/machine/_stdint.h
+++ b/photon/libc/include/machine/_stdint.h
@@ -222,6 +222,12 @@ typedef long __intptr_t;
 typedef unsigned long __uintptr_t;
 #endif
 
+#ifdef __SIZE_TYPE__
+typedef __SIZE_TYPE__ __size_t;
+#else
+typedef unsigned long long __size_t;
+#endif
+
 typedef __int8_t __int_fast8_t;
 typedef __uint8_t __uint_fast8_t;
 
diff --git a/photon/libc/include/stddef.h b/photon/libc/include/stddef.h
index f4f764d..73c6622 100644
--- a/photon/libc/include/stddef.h
+++ b/photon/libc/include/stddef.h
@@ -17,7 +17,7 @@ typedef __intptr_t ptrdiff_t;
 
 #ifndef __size_t_defined
 #define __size_t_defined
-typedef __uintptr_t size_t;
+typedef __size_t size_t;
 #endif
 
 #if defined(__cplusplus)
diff --git a/photon/libc/include/string.h b/photon/libc/include/string.h
index 7e816e3..b123a81 100644
--- a/photon/libc/include/string.h
+++ b/photon/libc/include/string.h
@@ -8,7 +8,7 @@ extern "C" {
 #endif
 
 extern void *memcpy(void *dest, const void *src, size_t sz);
-extern void *memcmp(const void *a, const void *b, size_t sz);
+extern int memcmp(const void *a, const void *b, size_t sz);
 extern void *memmove(void *dest, const void *src, size_t sz);
 extern void *memset(void *ptr, int value, size_t sz);