Portability updates

diff --git a/akiko.cpp b/akiko.cpp
index 688aa185c066d7354112d3cf911da62cf76b5d51..d3dee2453b26d144175f3131084f95767f780dc2 100644 (file)
--- a/akiko.cpp
+++ b/akiko.cpp
@@ -506,10 +506,10 @@ static smp_comm_pipe requests;
 static volatile int akiko_thread_running;
 static uae_sem_t akiko_sem, sub_sem, cda_sem;
 
-static void checkint (void)
+static void akiko_checkint(void)
 {
        if (cdrom_intreq & cdrom_intena) {
-               irq ();
+               irq();
 #if AKIKO_DEBUG_IRQ
                write_log(_T("CD32: Akiko INT %08x\n"), cdrom_intreq & cdrom_intena);
 #endif
@@ -520,22 +520,22 @@ static void checkint (void)
        }
 }
 
-static void set_status (uae_u32 status)
+static void set_status(uae_u32 status)
 {
 #if AKIKO_DEBUG_IO
        if (log_cd32 > 1) {
                if (!(cdrom_intreq & status))
-                       write_log (_T("CD32: Akiko IRQ %08x | %08x = %08x\n"), status, cdrom_intreq, cdrom_intreq | status);
+                       write_log(_T("CD32: Akiko IRQ %08x | %08x = %08x\n"), status, cdrom_intreq, cdrom_intreq | status);
        }
 #endif
        cdrom_intreq |= status;
-       checkint ();
+       akiko_checkint();
        cdrom_led ^= LED_CD_ACTIVE2;
 }
 
 static void rethink_akiko(void)
 {
-       checkint ();
+       akiko_checkint();
 }
 
 static void cdaudiostop_do (void)

diff --git a/cfgfile.cpp b/cfgfile.cpp
index d56a945fb4839bc3eeb8ee33ea9a0bf1adebd1cb..4ff05717f906d290d7e0639085dd1d14a9bcc756 100644 (file)
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -935,10 +935,12 @@ static void cfgfile_write_str(struct zfile *f, const TCHAR *option, const TCHAR
 {
        cfg_dowrite(f, option, optionext, value, 0, 0, 0);
 }
-static void cfgfile_write_str_escape(struct zfile *f, const TCHAR *option, const TCHAR *value)
+#if 0
+void cfgfile_write_str_escape(struct zfile *f, const TCHAR *option, const TCHAR *value)
 {
        cfg_dowrite(f, option, value, 0, 0, 1);
 }
+#endif
 void cfgfile_dwrite_str(struct zfile *f, const TCHAR *option, const TCHAR *value)
 {
        cfg_dowrite(f, option, value, 1, 0, 0);

diff --git a/cia.cpp b/cia.cpp
index 37f65213253854453735b8bc83c238c7af403fe6..251fa9d1b4c3aa8be1542d49c26b9586b171de9a 100644 (file)
--- a/cia.cpp
+++ b/cia.cpp
@@ -2132,6 +2132,7 @@ static void WriteCIAA(uae_u16 addr, uae_u8 val, uae_u32 *flags)
 #endif
                break;
        case 1:
+       {
 #if DONGLE_DEBUG > 0
                if (notinrom ())
                        write_log(_T("BFE101 W %02X %s\n"), val, debuginfo(0));
@@ -2142,27 +2143,31 @@ static void WriteCIAA(uae_u16 addr, uae_u8 val, uae_u32 *flags)
                alg_parallel_port(c->drb, val);
 #endif
 #ifdef PARALLEL_PORT
-               if (isprinter()) {
-                       if (isprinter() > 0) {
+               int printermode = isprinter();
+               if (printermode) {
+                       if (printermode > 0) {
                                doprinter(val);
                                cia_parallelack();
-                       } else if (isprinter() < 0) {
+                       } else if (printermode) {
                                parallel_direct_write_data(val, c->drb);
                                cia_parallelack();
                        }
                }
+#else
+               int printermode = 0;
 #endif
 #ifdef ARCADIA
-               if (!isprinter() && arcadia_bios) {
+               if (!printermode && arcadia_bios) {
                        arcadia_parport(1, c->prb, c->drb);
                }
 #endif
 #ifdef PARALLEL_PORT
-               if (!isprinter() && parallel_port_scsi) {
+               if (!printermode && parallel_port_scsi) {
                        parallel_port_scsi_write(0, c->prb, c->drb);
                }
 #endif
-               break;
+       }
+       break;
        case 2:
 #if DONGLE_DEBUG > 0
                if (notinrom ())

diff --git a/debug.cpp b/debug.cpp
index 1e6f78fc23fa183fe036c636aad98e90b05a7c74..c90eb4665fd6782939277f2ef4939793d1ea8864 100644 (file)
--- a/debug.cpp
+++ b/debug.cpp
@@ -16,6 +16,7 @@
 
 #include "options.h"
 #include "uae.h"
+#include "uae/io.h"
 #include "memory.h"
 #include "custom.h"
 #include "newcpu.h"

diff --git a/disk.cpp b/disk.cpp
index 8ed555575d40224b673a61aec721f61f39a20ae0..583a10284b958412be48302ab85de1589d54f6c2 100644 (file)
--- a/disk.cpp
+++ b/disk.cpp
@@ -3371,6 +3371,7 @@ void disk_insert_force (int num, const TCHAR *name, bool forcedwriteprotect)
 
 static void floppybridge_getsetprofile(int i)
 {
+#ifdef FLOPPYBRIDGE
        if (currprefs.floppyslots[i].dfxsubtype == 0 || currprefs.floppyslots[i].dfxsubtypeid[0] == 0) {
                int sub = currprefs.floppyslots[i].dfxsubtype;
                if (sub == 0) {
@@ -3385,6 +3386,7 @@ static void floppybridge_getsetprofile(int i)
                        _tcscpy(currprefs.floppyslots[i].dfxsubtypeid, changed_prefs.floppyslots[i].dfxsubtypeid);
                }
        }
+#endif
 }
 
 static void DISK_check_change (void)

diff --git a/expansion.cpp b/expansion.cpp
index 7748ce8ab0c242466a5fbccfdb8ceffff7280f3b..91ca594bf078db4839e047b2cf93deaf61bfcea2 100644 (file)
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -6332,6 +6332,7 @@ const struct expansionromtype expansionroms[] = {
 #endif
 
                /* Network */
+#ifdef A2065
        {
                _T("a2065"), _T("A2065"), _T("Commodore"),
                NULL, a2065_init, NULL, NULL, ROMTYPE_A2065 | ROMTYPE_NOT, 0, 0, BOARD_AUTOCONFIG_Z2, true,
@@ -6350,6 +6351,7 @@ const struct expansionromtype expansionroms[] = {
                false, 0, ethernet_settings,
                { 0xc1, 0xc9, 0x00, 0x00, 2167 >> 8, 2167 & 255, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
        },
+#endif
 #ifdef WITH_QEMU_CPU
        {
                _T("ariadne2"), _T("Ariadne II"), _T("Village Tronic"),

diff --git a/include/bsdsocket.h b/include/bsdsocket.h
index 9b50c9bc312ce05c8ef703bf17f85c83ae018483..5fbe31d9d15c353f77f310393a9a57f2190c4394 100644 (file)
--- a/include/bsdsocket.h
+++ b/include/bsdsocket.h
@@ -11,6 +11,7 @@
 #define UAE_BSDSOCKET_H
 
 #include "uae/types.h"
+#include "threaddep/thread.h"
 
 #define BSD_TRACING_ENABLED 0
 

diff --git a/include/custom.h b/include/custom.h
index 888bf27c0c5d3f8b0cbffd4311db7f2f2990435d..9d028b9e9d31e61e9559f28928710e942af44cc5 100644 (file)
--- a/include/custom.h
+++ b/include/custom.h
@@ -10,6 +10,7 @@
 #define UAE_CUSTOM_H
 
 #include "uae/types.h"
+#include "uae/time.h"
 #include "machdep/rpt.h"
 
 #define BEAMCON0_HARDDIS       0x4000

diff --git a/include/execio.h b/include/execio.h
index 178870414cddd3891cca63ab680664ffe8f37540..9afc4fe63c7c1895af49742907291b716452c0b8 100644 (file)
--- a/include/execio.h
+++ b/include/execio.h
@@ -57,7 +57,7 @@
 #define TAG_IGNORE 1
 #define TAG_MORE   2
 #define TAG_SKIP   3
-#define TAG_USER   (1 << 31)
+#define TAG_USER   (1UL << 31)
 
 #define NSDEVTYPE_UNKNOWN       0
 #define NSDEVTYPE_GAMEPORT      1

diff --git a/include/sysdeps.h b/include/sysdeps.h
index 04c9de5739d94658229b2fa634827ba420f214dc..e7e49be17709cc0d3e331008a142c4d05a798027 100644 (file)
--- a/include/sysdeps.h
+++ b/include/sysdeps.h
@@ -40,7 +40,7 @@ using namespace std;
 #define UAE
 #endif
 
-#if defined(_M_ARM64) || defined(_M_ARM64EC) 
+#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) 
 #define CPU_arm 1
 #define ARM_ASSEMBLY 1
 #define CPU_64_BIT 1

diff --git a/include/xwin.h b/include/xwin.h
index 2f06950c4128fd4d7dad7bd90eb0925864d407b2..885e0e2652733814c96b1642a044ef56355d9f91 100644 (file)
--- a/include/xwin.h
+++ b/include/xwin.h
@@ -10,6 +10,7 @@
 #define UAE_XWIN_H
 
 #include "uae/types.h"
+#include "uae/time.h"
 #include "machdep/rpt.h"
 
 typedef uae_u32 xcolnr;

diff --git a/logging.cpp b/logging.cpp
index 1018a973f1ab2e507af7923231a07cb53a4d26f0..ba9e5d653d7de82b245b73b27d4ae2083446cd40 100644 (file)
--- a/logging.cpp
+++ b/logging.cpp
@@ -1,3 +1,7 @@
+
+#include "sysconfig.h"
+#include "sysdeps.h"
+
 #include "uae/log.h"
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/zfile.cpp b/zfile.cpp
index e559560e3cf9e038b8e80537f43fdcd13a79d17a..3cd9b80bb824158141b05106827c2597fb815ce9 100644 (file)
--- a/zfile.cpp
+++ b/zfile.cpp
@@ -13,6 +13,7 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 
+#include "uae.h"
 #include "options.h"
 #include "zfile.h"
 #include "disk.h"