OSDN Git Service

[Build] FIX FTBFS with llvm CLANG.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Mon, 4 Dec 2017 10:27:41 +0000 (19:27 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Mon, 4 Dec 2017 10:27:41 +0000 (19:27 +0900)
source/src/debugger.cpp
source/src/vm/fm7/vram.cpp

index 488a98b..98e2bc7 100644 (file)
@@ -141,7 +141,7 @@ void* debugger_thread(void *lpx)
        _TCHAR buffer[1024];
        bool cp932 = (p->osd->get_console_code_page() == 932);
        
-       p->osd->open_console(create_string(_T("Debugger - %s"), _T(DEVICE_NAME)));
+       p->osd->open_console((_TCHAR *)create_string(_T("Debugger - %s"), _T(DEVICE_NAME)));
        
        // break cpu
        DEVICE *cpu = p->vm->get_cpu(p->cpu_index);
index e44ff3c..e0a18c0 100644 (file)
@@ -95,7 +95,13 @@ void DISPLAY::GETVRAM_8_200L(int yoff, scrntype_t *p,
 
        scrntype_t tmp_dd[8];
        for(int i = 0; i < 8; i++) {
-               tmp_d[i] = pg[i] | pr[i] | pb[i];
+               tmp_d[i] = pg[i];
+       }
+       for(int i = 0; i < 8; i++) {
+               tmp_d[i] = tmp_d[i] | pr[i];
+       }
+       for(int i = 0; i < 8; i++) {
+               tmp_d[i] = tmp_d[i] | pb[i];
        }
        for(int i = 0; i < 8; i++) {
                tmp_d[i] = tmp_d[i] >> 5;