diff --git a/src/boards/__serial.h b/src/boards/__serial.h index b022a6d..7b6bb57 100644 --- a/src/boards/__serial.h +++ b/src/boards/__serial.h @@ -3,10 +3,8 @@ #include -#ifdef _WIN32 && !defined(_XBOX) -#include -#else -#define BOOL int +#ifdef _WIN32 +typedef int BOOL; #ifndef TRUE #define TRUE 1 diff --git a/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj b/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj index 1589d39..9a0100c 100644 --- a/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj +++ b/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj @@ -859,14 +859,6 @@ CompileAsC CompileAsC - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC CompileAsC @@ -963,6 +955,7 @@ CompileAsC CompileAsC + CompileAsC CompileAsC @@ -1251,6 +1244,7 @@ CompileAsC CompileAsC + CompileAsC CompileAsC @@ -1467,14 +1461,6 @@ CompileAsC CompileAsC - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC CompileAsC @@ -1836,4 +1822,4 @@ - + \ No newline at end of file diff --git a/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters b/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters index 8d80350..7f1b6f7 100644 --- a/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters +++ b/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters @@ -413,9 +413,6 @@ Source Files\boards - - Source Files\boards - Source Files\boards @@ -581,9 +578,6 @@ Source Files - - Source Files - Source Files @@ -617,6 +611,12 @@ Source Files + + Source Files + + + Source Files\boards + diff --git a/src/fceu-memory.c b/src/fceu-memory.c index c8e9b98..e48972a 100644 --- a/src/fceu-memory.c +++ b/src/fceu-memory.c @@ -65,8 +65,8 @@ void FASTAPASS(3) FCEU_memmove(void *d, void *s, uint32 l) { if (t & 3) { // Not 4-byte aligned and/or length is not a multiple of 4. uint8 *tmpd, *tmps; - tmpd = d; - tmps = s; + tmpd = (uint8*)d; + tmps = (uint8*)s; for (x = l; x; x--) { // This could be optimized further, though(more tests could be performed). *tmpd = *tmps; @@ -76,8 +76,8 @@ void FASTAPASS(3) FCEU_memmove(void *d, void *s, uint32 l) { } else { uint32 *tmpd, *tmps; - tmpd = d; - tmps = s; + tmpd = (uint32*)d; + tmps = (uint32*)s; for (x = l >> 2; x; x--) { *tmpd = *tmps; diff --git a/src/state.h b/src/state.h index e1c481b..5d9182d 100644 --- a/src/state.h +++ b/src/state.h @@ -34,7 +34,7 @@ void FCEUSS_CheckStates(void); typedef struct { void *v; uint32 s; - char desc[4]; + char desc[5]; } SFORMAT; void ResetExState(void (*PreSave)(void), void (*PostSave)(void));