[BUILD][LLVM] Fix FTBFS.

diff --git a/source/src/emu.cpp b/source/src/emu.cpp
index 3533350..6eccfd6 100644 (file)
--- a/source/src/emu.cpp
+++ b/source/src/emu.cpp
@@ -1742,9 +1742,10 @@ bool EMU::is_bubble_casette_protected(int drv)
 void EMU::is_bubble_casette_protected(int drv, bool flag)
 {
        if(drv < MAX_BUBBLE) {
-               return vm->is_bubble_casette_protected(drv, flag);
+               vm->is_bubble_casette_protected(drv, flag);
+               return;
        } else {
-               return false;
+               return;
        }
 }
 #endif

diff --git a/source/src/vm/fm7/fm7.cpp b/source/src/vm/fm7/fm7.cpp
index 029776a..4dfca06 100644 (file)
--- a/source/src/vm/fm7/fm7.cpp
+++ b/source/src/vm/fm7/fm7.cpp
@@ -852,11 +852,11 @@ void VM::set_cpu_clock(DEVICE *cpu, uint32_t clocks) {
 }
 
 #if defined(USE_BUBBLE1)
-void VM::open_bubble_casette(int drv, _TCHAR *path, int bank)
+void VM::open_bubble_casette(int drv, const _TCHAR *path, int bank)
 {
        if((drv >= 2) || (drv < 0)) return;
        if(bubble_casette[drv] == NULL) return;
-       bubble_casette[drv]->open(path, bank);
+       bubble_casette[drv]->open((_TCHAR *)path, bank);
 }
 
 void VM::close_bubble_casette(int drv)

diff --git a/source/src/vm/fm7/fm7.h b/source/src/vm/fm7/fm7.h
index aaa78c4..6854a61 100644 (file)
--- a/source/src/vm/fm7/fm7.h
+++ b/source/src/vm/fm7/fm7.h
@@ -536,7 +536,7 @@ public:
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
 #if defined(USE_BUBBLE1)
-       void open_bubble_casette(int drv, _TCHAR *path, int bank);
+       void open_bubble_casette(int drv, const _TCHAR *path, int bank);
        void close_bubble_casette(int drv);
        bool is_bubble_casette_inserted(int drv);
        bool is_bubble_casette_protected(int drv);

diff --git a/source/src/vm/fm7/fm7_mainmem.cpp b/source/src/vm/fm7/fm7_mainmem.cpp
index bd23c00..d45e371 100644 (file)
--- a/source/src/vm/fm7/fm7_mainmem.cpp
+++ b/source/src/vm/fm7/fm7_mainmem.cpp
@@ -665,7 +665,7 @@ bool FM7_MAINMEM::load_state(FILEIO *state_fio)
                        fm7_mainmem_extram = NULL;
                }
                if(pages > 0) {
-                       fm7_mainmem_extram = malloc(pages * 0x10000);
+                       fm7_mainmem_extram = (uint8_t *)malloc(pages * 0x10000);
                        state_fio->Fread(fm7_mainmem_extram, pages * 0x10000, 1);
                }
 #  if defined(_FM77_VARIANTS)