From 88fc94eea774afdf74ae50f6d79ae271e5b635c6 Mon Sep 17 00:00:00 2001
From: Vincent Barrilliot <vincent.barrilliot@sfr.fr>
Date: Fri, 3 Nov 2023 21:56:35 +0100
Subject: [PATCH] Fix warnings with functions from C lib being redeclared

---
 vbcc/targets/m68k-foenix/include/ctype.h  |  4 ++--
 vbcc/targets/m68k-foenix/include/stdlib.h |  5 +++--
 vbcc/targets/m68k-foenix/include/string.h | 25 +++++++++++++----------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/vbcc/targets/m68k-foenix/include/ctype.h b/vbcc/targets/m68k-foenix/include/ctype.h
index bc78396..b496639 100644
--- a/vbcc/targets/m68k-foenix/include/ctype.h
+++ b/vbcc/targets/m68k-foenix/include/ctype.h
@@ -29,10 +29,10 @@ int isxdigit(int);
 #define isprint(x)  (__ctype[(x)+1] & 151)
 #define isgraph(x)  (__ctype[(x)+1] & 23)
 
+#ifdef __NOINLINE__
 int toupper(int);
 int tolower(int);
-
-#ifndef __NOINLINE__
+#else
 int toupper(__reg("d0") int) =
         "\tinline\n"
         "\txref\t___ctype\n"
diff --git a/vbcc/targets/m68k-foenix/include/stdlib.h b/vbcc/targets/m68k-foenix/include/stdlib.h
index 45856a5..34f703b 100644
--- a/vbcc/targets/m68k-foenix/include/stdlib.h
+++ b/vbcc/targets/m68k-foenix/include/stdlib.h
@@ -74,13 +74,14 @@ ldiv_t ldiv(long,long);
 lldiv_t lldiv(long long,long long);
 #endif
 
+
+#ifdef __NOINLINE__
 int abs(int);
 long labs(long);
 #if __STDC_VERSION__ >= 199901L
 long long llabs(long long);
 #endif
-
-#ifndef __NOINLINE__
+#else
 int abs(__reg("d0") int) =
                 "\tinline\n"
                 "\ttst.l\td0\n"
diff --git a/vbcc/targets/m68k-foenix/include/string.h b/vbcc/targets/m68k-foenix/include/string.h
index 1fb1608..403126e 100644
--- a/vbcc/targets/m68k-foenix/include/string.h
+++ b/vbcc/targets/m68k-foenix/include/string.h
@@ -9,30 +9,33 @@ typedef unsigned long size_t;
 #undef NULL
 #define NULL ((void *)0)
 
-//void *memcpy(void *,const void *,size_t);
+
 void *memmove(void *,const void *,size_t);
-//char *strcpy(char *,const char *);
-char *strncpy(char *,const char *,size_t);
-//char *strcat(char *,const char *);
-//char *strncat(char *,const char *,size_t);
+
 int memcmp(const void *,const void *,size_t);
-//int strcmp(const char *,const char *);
-//int strncmp(const char *,const char *,size_t);
 void *memchr(const void *,int,size_t);
 char *strchr(const char *,int);
 size_t strcspn(const char *,const char *);
 char *strpbrk(const char *,const char *);
-//char *strrchr(const char *,int);
 size_t strspn(const char *,const char *);
 char *strstr(const char *,const char *);
-//void *memset(void *,int,size_t);
-//size_t strlen(const char *);
 char *strtok(char *,const char *);
 char *strerror(int);
 int strcoll(const char *,const char *);
 size_t strxfrm(char *,const char *,size_t);
 
-#ifndef __NOINLINE__
+#ifdef __NOINLINE__
+void *memcpy(void *,const void *,size_t);
+char *strcpy(char *,const char *);
+char *strncpy(char *,const char *,size_t);
+char *strcat(char *,const char *);
+char *strncat(char *,const char *,size_t);
+int strcmp(const char *,const char *);
+int strncmp(const char *,const char *,size_t);
+char *strrchr(const char *,int);
+void *memset(void *,int,size_t);
+size_t strlen(const char *);
+#else
 #if defined(__M68000) || defined(__M68010)
 void *memcpy(__reg("a0") void *, __reg("a1") const void *,
              __reg("d2") size_t) =