Fixed build with latest KallistiOS and GCC 15.1

DC-SWAT · DC-SWAT · commit de639ba6757b · 2025-05-12T18:16:09.000+07:00
diff --git a/applications/games_menu/modules/app_menu.h b/applications/games_menu/modules/app_menu.h
@@ -81,7 +81,7 @@ const char* GetCoversPath(uint8 device);
 void CreateMenuData(SendMessageCallBack *send_message_scan, SendMessageCallBack *send_message_optimizer
 	, PostPVRCoverCallBack *post_pvr_cover, PostOptimizerCoverCallBack *post_optimizer_cover);
 void DestroyMenuData();
-bool CheckGdiOptimized();
+bool CheckGdiOptimized(int game_index);
 const char *GetFullGamePathByIndex(int game_index);
 void StopCDDA();
 bool CheckCDDA(int game_index);
diff --git a/applications/gdplay/modules/module.c b/applications/gdplay/modules/module.c
@@ -275,10 +275,11 @@ static void check_cd(void)
 	cdrom_spin_down();
 }
 
-static void *check_gdrom()
+static void *check_gdrom(void *arg)
 {
 	int status, disc_type, cd_status;
 	self.kill_gdrom_thd = 0;
+	(void)arg;
 
 	while(self.kill_gdrom_thd == 0)
 	{
diff --git a/applications/main/modules/module.c b/applications/main/modules/module.c
@@ -315,7 +315,8 @@ static void ShowDateTime(int force) {
 	memcpy(&self.datetime, datetime, sizeof(*datetime));
 }
 
-static void *ClockThread() {
+static void *ClockThread(void *arg) {
+    (void)arg;
 
 	while(self.app->state & APP_STATE_OPENED) {
 		ShowDateTime(0);
diff --git a/applications/speedtest/modules/module.c b/applications/speedtest/modules/module.c
@@ -8,7 +8,8 @@
 */
 
 #include "ds.h"
-#include "drivers/sd.h"
+#include <dc/sd.h>
+#include <kos/blockdev.h>
 
 DEFAULT_MODULE_EXPORTS(app_speedtest);
 
@@ -109,7 +110,7 @@ int test_sd_io(void) {
 	if(!buf) {
 		return -1;
 	}
-	if(sdc_blockdev_for_partition(0, &bdev, &pt)) {
+	if(sd_blockdev_for_partition(0, &bdev, &pt)) {
 		dbglog(DBG_DEBUG, "Couldn't get blockdev for partition!\n");
 		free(buf);
 		return -1;
diff --git a/applications/vmu_manager/modules/module.c b/applications/vmu_manager/modules/module.c
@@ -450,8 +450,9 @@ static void show_port(int port, maple_device_t *dev)
 	show_slots(port);
 }
 
-static void *maple_scan()
+static void *maple_scan(void *arg)
 {
+	(void)arg;
 	self.thread_kill = 0;
 	int port;
 	maple_device_t *dev;
diff --git a/include/SDL/SDL_rwops.h b/include/SDL/SDL_rwops.h
@@ -31,6 +31,11 @@
 #include "SDL_error.h"
 
 #include "begin_code.h"
+
+#if defined(__DREAMCAST__) || defined(_arch_dreamcast)
+#include <kos/fs.h>
+#endif
+
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/SDL/include/SDL_rwops.h b/lib/SDL/include/SDL_rwops.h
@@ -31,6 +31,11 @@
 #include "SDL_error.h"
 
 #include "begin_code.h"
+
+#if defined(__DREAMCAST__) || defined(_arch_dreamcast)
+#include <kos/fs.h>
+#endif
+
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -106,7 +111,7 @@ extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromFile(const char *file, const char
 extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromFP(FILE *fp, int autoclose);
 #endif
 
-#ifdef __DREAMCAST__
+#if defined(__DREAMCAST__) || defined(_arch_dreamcast)
 extern DECLSPEC SDL_RWops * SDLCALL SDL_RWFromFD(file_t fd, int autoclose);
 #endif
 
diff --git a/lib/SDL_gui/FileManager.cc b/lib/SDL_gui/FileManager.cc
@@ -1,6 +1,7 @@
-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
+#include <kos/fs.h>
+#include <kos/thread.h>
 
 #include "SDL_gui.h"
 
diff --git a/modules/adx/LibADX/snddrv.c b/modules/adx/LibADX/snddrv.c
@@ -94,7 +94,8 @@ static void *snddrv_callback(snd_stream_hnd_t hnd, int len, int * actual) {
 
 }
 
-static void *snddrv_thread() {
+static void *snddrv_thread(void *arg) {
+    (void)arg;
 
     printf("SNDDRV: Rate - %i, Channels - %i\n", snddrv.rate, snddrv.channels);
     
diff --git a/modules/ftpd/lftpd/lftpd.c b/modules/ftpd/lftpd/lftpd.c
@@ -38,25 +38,25 @@ typedef struct {
 	int (*handler) (lftpd_client_t* client, const char* arg);
 } command_t;
 
-static int cmd_cwd();
-static int cmd_dele();
-static int cmd_epsv();
-static int cmd_feat();
-static int cmd_list();
-static int cmd_mkd();
-static int cmd_nlst();
-static int cmd_noop();
-static int cmd_pass();
-static int cmd_pasv();
-static int cmd_pwd();
-static int cmd_quit();
-static int cmd_rmd();
-static int cmd_retr();
-static int cmd_size();
-static int cmd_stor();
-static int cmd_syst();
-static int cmd_type();
-static int cmd_user();
+static int cmd_cwd(lftpd_client_t* client, const char* arg);
+static int cmd_dele(lftpd_client_t* client, const char* arg);
+static int cmd_epsv(lftpd_client_t* client, const char* arg);
+static int cmd_feat(lftpd_client_t* client, const char* arg);
+static int cmd_list(lftpd_client_t* client, const char* arg);
+static int cmd_mkd(lftpd_client_t* client, const char* arg);
+static int cmd_nlst(lftpd_client_t* client, const char* arg);
+static int cmd_noop(lftpd_client_t* client, const char* arg);
+static int cmd_pass(lftpd_client_t* client, const char* arg);
+static int cmd_pasv(lftpd_client_t* client, const char* arg);
+static int cmd_pwd(lftpd_client_t* client, const char* arg);
+static int cmd_quit(lftpd_client_t* client, const char* arg);
+static int cmd_rmd(lftpd_client_t* client, const char* arg);
+static int cmd_retr(lftpd_client_t* client, const char* arg);
+static int cmd_size(lftpd_client_t* client, const char* arg);
+static int cmd_stor(lftpd_client_t* client, const char* arg);
+static int cmd_syst(lftpd_client_t* client, const char* arg);
+static int cmd_type(lftpd_client_t* client, const char* arg);
+static int cmd_user(lftpd_client_t* client, const char* arg);
 
 static command_t commands[] = {
 	{ "CWD",  cmd_cwd },
diff --git a/modules/luaSocket/src/timeout.c b/modules/luaSocket/src/timeout.c
@@ -19,6 +19,10 @@
 #include <sys/time.h>
 #endif
 
+#if defined(_arch_dreamcast)
+#   include <kos/thread.h>
+#endif
+
 /* min and max macros */
 #ifndef MIN
 #define MIN(x, y) ((x) < (y) ? x : y)
diff --git a/modules/luaTask/src/ltask.c b/modules/luaTask/src/ltask.c
@@ -575,7 +575,7 @@ static OS_THREAD_FUNC taskthread( void *vp) {
     OsSetThreadData( threadDataKey, vp );
     te = ( TASK_ENTRY * ) vp;
 
-#ifndef NATV_WIN32
+#if 0//ndef NATV_WIN32
     pthread_setcanceltype( PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
     pthread_cleanup_push( taskCleanup, te);
 #endif
@@ -612,7 +612,7 @@ static OS_THREAD_FUNC taskthread( void *vp) {
     
     OsLockMutex( tlMutex, INFINITE);
     
-#ifndef NATV_WIN32
+#if 0//ndef NATV_WIN32
     pthread_cleanup_pop( 0);
 #endif
 
diff --git a/modules/luaTask/src/queue.c b/modules/luaTask/src/queue.c
@@ -39,9 +39,9 @@ static int InsertMsgAtQueueTail( QUEUE *pQueue, void *pMsg) {
     } else {
         pQueue->qMsgTail->next = pQMsg;
         pQueue->qMsgTail = pQMsg;
-    }
-    
-    pQueue->msgcount++;
+    }
+    
+    pQueue->msgcount++;
     
     return( 0);
 }
@@ -56,7 +56,7 @@ static QMSG * RemoveMsgFromQueueHead( QUEUE *pQueue) {
 
     pQueue->qMsgHead = pQueue->qMsgHead->next;
 
-    pQueue->msgcount--;
+    pQueue->msgcount--;
     
     return( pQMsg);
 }
@@ -183,7 +183,7 @@ int QueCreate( QUEUE *pQueue, int qLimit ) {
 
     pQueue->qMax     = qLimit;
     pQueue->qMsgHead = NULL;
-    pQueue->qMsgTail = NULL;
+    pQueue->qMsgTail = NULL;
     pQueue->msgcount = 0;
 
     return( 0);
diff --git a/modules/luaTask/src/queue.h b/modules/luaTask/src/queue.h
@@ -9,6 +9,10 @@
 #ifndef QUE_H_INCLUDED
 #define QUE_H_INCLUDED
 
+#if defined(_arch_dreamcast)
+#   include <kos/sem.h>
+#endif
+
 #define     QUE_NO_LIMIT    -1
 
 typedef struct  _qmsg   QMSG;
@@ -34,7 +38,7 @@ typedef struct _queue
      int        qNotFull;
 #endif
      QMSG       *qMsgHead;
-     QMSG       *qMsgTail;
+     QMSG       *qMsgTail;
      long        msgcount;
 } QUEUE;
 
diff --git a/modules/luaTask/src/syncos.c b/modules/luaTask/src/syncos.c
@@ -46,6 +46,10 @@
 
 #include <fcntl.h>
 
+#if defined(_arch_dreamcast)
+#   include <kos/thread.h>
+#endif
+
 long OsCreateThread( OS_THREAD_T *th, OS_THREAD threadfunc, void *param) {
 #ifdef NATV_WIN32
     unsigned        tid;
@@ -58,10 +62,10 @@ long OsCreateThread( OS_THREAD_T *th, OS_THREAD threadfunc, void *param) {
     int             status;
 
 	pthread_attr_init( &attr);
-	pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED);
+	pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED);
 #ifdef LUATASK_PTHREAD_STACK_SIZE
-    pthread_attr_setstacksize( &attr, LUATASK_PTHREAD_STACK_SIZE );
-#endif
+    pthread_attr_setstacksize( &attr, LUATASK_PTHREAD_STACK_SIZE );
+#endif
     status = pthread_create( th, &attr, threadfunc, param);
 	pthread_attr_destroy( &attr);
 
@@ -209,14 +213,14 @@ void OsSleep( long ms) {
 	thd_sleep(ms);
 /*
 #ifdef _WIN32
-    Sleep( ms);
-#else
-    struct timespec req, rem;
-    req.tv_sec = ms / 1000L;
-    req.tv_nsec = ms % 1000L;
-    req.tv_nsec *= 1000000L;
-    nanosleep( &req, &rem);
+    Sleep( ms);
+#else
+    struct timespec req, rem;
+    req.tv_sec = ms / 1000L;
+    req.tv_nsec = ms % 1000L;
+    req.tv_nsec *= 1000000L;
+    nanosleep( &req, &rem);
 #endif
 */
 }
-
+
diff --git a/modules/mongoose/mongoose.c b/modules/mongoose/mongoose.c
@@ -256,6 +256,10 @@ typedef int socklen_t;
 #define MSG_NOSIGNAL 0
 #endif
 
+#if defined(_arch_dreamcast)
+#   include <kos/thread.h>
+#endif
+
 typedef void * (*mg_thread_func_t)(void *);
 
 static const char *http_500_error = "Internal Server Error";
diff --git a/modules/mp3/libmp3/libmp3/mpg123_snddrv.c b/modules/mp3/libmp3/libmp3/mpg123_snddrv.c
@@ -288,7 +288,8 @@ int sndmp3_start_block(const char * fname) {
 	return 0;
 }
 
-void *snddrv_mp3_thread() {
+void *snddrv_mp3_thread(void *arg) {
+    (void)arg;
 	while( snddrv.dec_status != SNDDEC_STATUS_DONE && snddrv.dec_status != SNDDEC_STATUS_ERROR ) {
 
         /* A request has been made to access the decoder handle */
diff --git a/modules/mp3/libmp3/libmp3/snddrv.c b/modules/mp3/libmp3/libmp3/snddrv.c
@@ -94,7 +94,8 @@ static void *snddrv_callback(snd_stream_hnd_t hnd, int len, int * actual) {
 
 }
 
-static void *snddrv_thread() {
+static void *snddrv_thread(void *arg) {
+    (void)arg;
 
     printf("SNDDRV: Rate - %i, Channels - %i\n", snddrv.rate, snddrv.channels);
     
diff --git a/src/drivers/enc28j60.c b/src/drivers/enc28j60.c
@@ -15,6 +15,7 @@
 #include <arch/timer.h>
 #include <kos/net.h>
 #include <kos/netcfg.h>
+#include <kos/thread.h>
 #include "drivers/enc28j60.h"
 #include "drivers/spi.h"
 
diff --git a/src/img/SegaPVRImage.c b/src/img/SegaPVRImage.c
@@ -16,6 +16,7 @@
 
 #if defined(__DREAMCAST__)
 #include <malloc.h>
+#include <kos/fs.h>
 #endif
 
 // Twiddle

Original file line number	Diff line number	Diff line change
`@@ -275,10 +275,11 @@ static void check_cd(void)`
`275`	`275`	`cdrom_spin_down();`
`276`	`276`	`}`
`277`	`277`
`278`		`-static void *check_gdrom()`
	`278`	`+static void check_gdrom(void arg)`
`279`	`279`	`{`
`280`	`280`	`int status, disc_type, cd_status;`
`281`	`281`	`self.kill_gdrom_thd = 0;`
	`282`	`+ (void)arg;`
`282`	`283`
`283`	`284`	`while(self.kill_gdrom_thd == 0)`
`284`	`285`	`{`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,8 @@ static void ShowDateTime(int force) {`
`315`	`315`	`memcpy(&self.datetime, datetime, sizeof(*datetime));`
`316`	`316`	`}`
`317`	`317`
`318`		`-static void *ClockThread() {`
	`318`	`+static void ClockThread(void arg) {`
	`319`	`+ (void)arg;`
`319`	`320`
`320`	`321`	`while(self.app->state & APP_STATE_OPENED) {`
`321`	`322`	`ShowDateTime(0);`
Original file line number	Diff line number	Diff line change
`@@ -450,8 +450,9 @@ static void show_port(int port, maple_device_t *dev)`
`450`	`450`	`show_slots(port);`
`451`	`451`	`}`
`452`	`452`
`453`		`-static void *maple_scan()`
	`453`	`+static void maple_scan(void arg)`
`454`	`454`	`{`
	`455`	`+ (void)arg;`
`455`	`456`	`self.thread_kill = 0;`
`456`	`457`	`int port;`
`457`	`458`	`maple_device_t *dev;`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ static void snddrv_callback(snd_stream_hnd_t hnd, int len, int actual) {`
`94`	`94`
`95`	`95`	`}`
`96`	`96`
`97`		`-static void *snddrv_thread() {`
	`97`	`+static void snddrv_thread(void arg) {`
	`98`	`+ (void)arg;`
`98`	`99`
`99`	`100`	`printf("SNDDRV: Rate - %i, Channels - %i\n", snddrv.rate, snddrv.channels);`
`100`	`101`