diff --git a/src/kernel/emulation/linux/bsdthread/bsdthread_create.c b/src/kernel/emulation/linux/bsdthread/bsdthread_create.c index 804276227..b0c5ba1e8 100644 --- a/src/kernel/emulation/linux/bsdthread/bsdthread_create.c +++ b/src/kernel/emulation/linux/bsdthread/bsdthread_create.c @@ -74,6 +74,7 @@ void* thread_stack_allocate(unsigned long stacksize) return (void*) (((uintptr_t)stack) + stacksize + STACK_GUARD_SIZE); } +#if 0 int darling_thread_create(void** stack, void* entry_point, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5, uintptr_t arg6) { @@ -115,5 +116,6 @@ int darling_thread_create(void** stack, void* entry_point, uintptr_t arg3, #endif return ret; } +#endif diff --git a/src/kernel/emulation/linux/ioctl/ioctl.c b/src/kernel/emulation/linux/ioctl/ioctl.c index 60cc8579f..b62cdb694 100644 --- a/src/kernel/emulation/linux/ioctl/ioctl.c +++ b/src/kernel/emulation/linux/ioctl/ioctl.c @@ -27,7 +27,7 @@ run_ioctl: } extern int sprintf(char* buf, const char* fmt, ...); -extern int strncmp(const char *, const char *, unsigned long); +extern int strncmp(const char *, const char *, __SIZE_TYPE__); static bool get_fd_path(int fd, char* buf, size_t len) { char proc[32]; diff --git a/src/kernel/emulation/linux/misc/sysctl.c b/src/kernel/emulation/linux/misc/sysctl.c index dadc44b6e..c3d4f680d 100644 --- a/src/kernel/emulation/linux/misc/sysctl.c +++ b/src/kernel/emulation/linux/misc/sysctl.c @@ -20,7 +20,7 @@ static long sysctl_name_to_oid(const char* name, int* oid_name, unsigned long* oid_len); extern char *strchr(const char *s, int c); -extern int strncmp(const char *s1, const char *s2, unsigned long n); +extern int strncmp(const char *s1, const char *s2, __SIZE_TYPE__ n); extern int strcmp(const char *s1, const char *s2); extern kern_return_t mach_port_deallocate(ipc_space_t task, mach_port_name_t name); extern kern_return_t host_info(mach_port_name_t host, int itype, void* hinfo, mach_msg_type_number_t* count); diff --git a/src/kernel/emulation/linux/network/connect.c b/src/kernel/emulation/linux/network/connect.c index 89cdcaf71..893fa641f 100644 --- a/src/kernel/emulation/linux/network/connect.c +++ b/src/kernel/emulation/linux/network/connect.c @@ -6,7 +6,7 @@ #include "../../../../../platform-include/sys/errno.h" #include "duct.h" -extern void *memcpy(void *dest, const void *src, unsigned long n); +extern void *memcpy(void *dest, const void *src, __SIZE_TYPE__ n); long sys_connect(int fd, const void* name, int socklen) { diff --git a/src/kernel/emulation/linux/network/recvfrom.c b/src/kernel/emulation/linux/network/recvfrom.c index ae0152f2b..704cd93d1 100644 --- a/src/kernel/emulation/linux/network/recvfrom.c +++ b/src/kernel/emulation/linux/network/recvfrom.c @@ -6,7 +6,7 @@ #include "socket.h" #include "duct.h" -extern void *memcpy(void *dest, const void *src, unsigned long n); +extern void *memcpy(void *dest, const void *src, __SIZE_TYPE__ n); long sys_recvfrom(int fd, void* buf, unsigned long len, int flags, const void* from, int* socklen) diff --git a/src/kernel/emulation/linux/network/recvmsg.c b/src/kernel/emulation/linux/network/recvmsg.c index 91eb727df..30054de59 100644 --- a/src/kernel/emulation/linux/network/recvmsg.c +++ b/src/kernel/emulation/linux/network/recvmsg.c @@ -5,9 +5,9 @@ #include #include "duct.h" -extern void *malloc(unsigned long size); +extern void *malloc(__SIZE_TYPE__ size); extern void free(void* ptr); -extern void* memcpy(void* dest, const void* src, unsigned long len); +extern void* memcpy(void* dest, const void* src, __SIZE_TYPE__ len); long sys_recvmsg(int socket, struct bsd_msghdr* msg, int flags) { diff --git a/src/kernel/emulation/linux/network/sendmsg.c b/src/kernel/emulation/linux/network/sendmsg.c index b48a433b5..d21f7db57 100644 --- a/src/kernel/emulation/linux/network/sendmsg.c +++ b/src/kernel/emulation/linux/network/sendmsg.c @@ -5,9 +5,9 @@ #include #include "duct.h" -extern void *malloc(unsigned long size); +extern void *malloc(__SIZE_TYPE__ size); extern void free(void* ptr); -extern void* memcpy(void* dest, const void* src, unsigned long len); +extern void* memcpy(void* dest, const void* src, __SIZE_TYPE__ len); long sys_sendmsg(int socket, const struct bsd_msghdr* msg, int flags) { diff --git a/src/kernel/emulation/linux/signal/sigaction.c b/src/kernel/emulation/linux/signal/sigaction.c index 33030c9d3..a81230108 100644 --- a/src/kernel/emulation/linux/signal/sigaction.c +++ b/src/kernel/emulation/linux/signal/sigaction.c @@ -11,7 +11,7 @@ static int sigflags_bsd_to_linux(int flags); static int sigflags_linux_to_bsd(int flags); extern void sig_restorer(void); -extern void* memcpy(void* dest, const void* src, unsigned long len); +extern void* memcpy(void* dest, const void* src, __SIZE_TYPE__ len); // Libc uses only one trampoline void (*sa_tramp)(void*, int, int, struct bsd_siginfo*, void*) = 0; diff --git a/src/kernel/emulation/linux/simple.c b/src/kernel/emulation/linux/simple.c index 355a7d204..483e20244 100644 --- a/src/kernel/emulation/linux/simple.c +++ b/src/kernel/emulation/linux/simple.c @@ -117,10 +117,10 @@ void __simple_printf(const char* format, ...) LINUX_SYSCALL3(__NR_write, 1, buffer, __simple_strlen(buffer)); } -extern void *memmove(void *dest, const void *src, unsigned long n); -extern void *memcpy(void *dest, const void *src, unsigned long n); -extern void *memchr(const void *s, int c, unsigned long n); -extern long sys_read(int fd, void* buf, unsigned long n); +extern void *memmove(void *dest, const void *src, __SIZE_TYPE__ n); +extern void *memcpy(void *dest, const void *src, __SIZE_TYPE__ n); +extern void *memchr(const void *s, int c, __SIZE_TYPE__ n); +extern long sys_read(int fd, void* buf, __SIZE_TYPE__ n); #ifndef min # define min(a,b) ((a) < (b) ? (a) : (b)) diff --git a/src/kernel/emulation/linux/stat/fstatfs.c b/src/kernel/emulation/linux/stat/fstatfs.c index 3f28225aa..9a6643e28 100644 --- a/src/kernel/emulation/linux/stat/fstatfs.c +++ b/src/kernel/emulation/linux/stat/fstatfs.c @@ -11,9 +11,9 @@ #include extern char *strtok_r(char *str, const char *delim, char **saveptr); -extern unsigned long strlcpy(char* dst, const char* src, unsigned long size); -extern unsigned long strlen(const char* str); -extern int strncmp(const char* s1, const char* s2, unsigned long len); +extern __SIZE_TYPE__ strlcpy(char* dst, const char* src, __SIZE_TYPE__ size); +extern __SIZE_TYPE__ strlen(const char* str); +extern int strncmp(const char* s1, const char* s2, __SIZE_TYPE__ len); extern int sprintf(char *str, const char *format, ...); long sys_fstatfs(int fd, struct bsd_statfs* buf) diff --git a/src/kernel/emulation/linux/stat/statfs.c b/src/kernel/emulation/linux/stat/statfs.c index a7e6782c5..82a1475b2 100644 --- a/src/kernel/emulation/linux/stat/statfs.c +++ b/src/kernel/emulation/linux/stat/statfs.c @@ -10,9 +10,9 @@ #include extern char *strtok_r(char *str, const char *delim, char **saveptr); -extern unsigned long strlcpy(char* dst, const char* src, unsigned long size); -extern unsigned long strlen(const char* str); -extern int strncmp(const char* s1, const char* s2, unsigned long len); +extern __SIZE_TYPE__ strlcpy(char* dst, const char* src, __SIZE_TYPE__ size); +extern __SIZE_TYPE__ strlen(const char* str); +extern int strncmp(const char* s1, const char* s2, __SIZE_TYPE__ len); long sys_statfs(const char* path, struct bsd_statfs* buf) {