Fix AMIGA_OS Warnings

Change __PS2SDK_IOP__ to __ps2sdk__
sahlberg · Jun 8, 2024 · 4051b0b · 4051b0b
1 parent 6a0c8c0
commit 4051b0b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/include/asprintf.h b/include/asprintf.h
@@ -2,7 +2,7 @@
 #ifndef _ASPRINTF_H_
 #define _ASPRINTF_H_
 
-#if !defined(__AROS__) && !defined(__PS2SDK_IOP__)
+#if !defined(__AROS__) && !defined(__ps2sdk__)
 #include <malloc.h>
 #endif
 #include <stdio.h>

diff --git a/lib/Makefile.AMIGA b/lib/Makefile.AMIGA
@@ -5,7 +5,7 @@ STRIP  = ppc-amigaos-strip
 
 OPTIMIZE = -O2
 DEBUG    = -gstabs
-WARNINGS = -Wall -Wno-pointer-sign -Wno-discarded-qualifiers -Wwrite-strings -Werror
+WARNINGS = -Wall -Werror -Wwrite-strings
 INCLUDES = -I. -I../include -I../include/smb2 -I../include/amiga_os
 DEFINES  = -DHAVE_CONFIG_H "-D_U_=__attribute__((unused))" -DNEED_POLL -DNEED_GETADDRINFO -DNEED_FREEADDRINFO -DNEED_GETLOGIN_R -DHAVE_LINGER
 

diff --git a/lib/compat.h b/lib/compat.h
@@ -428,7 +428,7 @@ struct sockaddr_storage {
 #ifdef _EE
 #include <unistd.h>
 #else
-#ifndef __PS2SDK_IOP__
+#ifndef __ps2sdk__
 #include <alloc.h>
 #endif
 #include <stdint.h>
@@ -452,14 +452,6 @@ long long int be64toh(long long int x);
 #ifdef _IOP
 char *strdup(const char *s);
 
-#ifdef __PS2SDK_IOP__
-void *malloc(int size);
-
-void free(void *ptr);
-
-void *calloc(size_t nmemb, size_t size);
-#endif
-
 int random(void);
 void srandom(unsigned int seed);
 time_t time(time_t *tloc);
@@ -469,9 +461,6 @@ int getlogin_r(char *buf, size_t size);
 
 #ifdef _IOP
 int getpid();
-#endif
-
-#ifdef _IOP
 #define close(x) lwip_close(x)
 #define snprintf(format, n, ...) sprintf(format, __VA_ARGS__)
 #define fcntl(a,b,c) lwip_fcntl(a,b,c)
@@ -519,6 +508,14 @@ int iop_connect(int sockfd, struct sockaddr *addr, socklen_t addrlen);
 #define read(a,b,c) lwip_recv(a,b,c,MSG_DONTWAIT)
 #endif
 
+#ifdef __ps2sdk__
+void *malloc(int size);
+
+void free(void *ptr);
+
+void *calloc(size_t nmemb, size_t size);
+#endif
+
 ssize_t writev(t_socket fd, const struct iovec *iov, int iovcnt);
 ssize_t readv(t_socket fd, const struct iovec *iov, int iovcnt);
 

diff --git a/lib/libsmb2.c b/lib/libsmb2.c
@@ -2398,7 +2398,7 @@ readlink_cb_3(struct smb2_context *smb2, int status,
 {
         struct readlink_cb_data *cb_data = private_data;
         struct smb2_reparse_data_buffer *rp = cb_data->reparse;
-        char *target = "<unknown reparse point type>";
+        char *target = (char*)"<unknown reparse point type>";
 
         if (rp) {
                 switch (rp->reparse_tag) {

diff --git a/lib/socket.c b/lib/socket.c
@@ -1079,7 +1079,7 @@ smb2_connect_async(struct smb2_context *smb2, const char *server,
         if (port != NULL) {
                 *port++ = 0;
         } else {
-                port = "445";
+                port = (char*)"445";
         }
 
         /* is it a hostname ? */