diff options
| author | twinaphex | 2018-02-21 13:49:45 +0100 |
|---|---|---|
| committer | twinaphex | 2018-02-21 13:49:45 +0100 |
| commit | ea4775801b424594e309a3413815b67cc53d6ac1 (patch) | |
| tree | 8b4e8b427cfca7128c8058da25591046ecb8da98 /source | |
| parent | b2859c8e0d5a7799058de685451ab8257d61ddcb (diff) | |
| download | snes9x2005-ea4775801b424594e309a3413815b67cc53d6ac1.tar.gz snes9x2005-ea4775801b424594e309a3413815b67cc53d6ac1.tar.bz2 snes9x2005-ea4775801b424594e309a3413815b67cc53d6ac1.zip | |
Update for MSVC
Diffstat (limited to 'source')
| -rw-r--r-- | source/cpuexec.h | 4 | ||||
| -rw-r--r-- | source/memmap.c | 6 | ||||
| -rw-r--r-- | source/port.h | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/source/cpuexec.h b/source/cpuexec.h index 3a5075b..4898207 100644 --- a/source/cpuexec.h +++ b/source/cpuexec.h @@ -5,11 +5,7 @@ typedef struct { -#ifdef __WIN32__ - void (__cdecl* S9xOpcode)(void); -#else void (*S9xOpcode)(void); -#endif } SOpcodes; #include "ppu.h" diff --git a/source/memmap.c b/source/memmap.c index 209b6cd..d5c29b1 100644 --- a/source/memmap.c +++ b/source/memmap.c @@ -471,7 +471,7 @@ static uint32_t FileLoader(uint8_t* buffer, const char* filename, int32_t maxsiz _splitpath(filename, drive, dir, name, ext); _makepath(fname, drive, dir, name, ext); -#ifdef __WIN32__ +#ifdef _WIN32 /* memmove required: Overlapping addresses [Neb] */ memmove(&ext [0], &ext[1], 4); #endif @@ -524,7 +524,7 @@ static uint32_t FileLoader(uint8_t* buffer, const char* filename, int32_t maxsiz { more = true; ext [0]++; -#ifdef __WIN32__ +#ifdef _WIN32 /* memmove required: Overlapping addresses [Neb] */ memmove(&ext [1], &ext [0], 4); ext [0] = '.'; @@ -535,7 +535,7 @@ static uint32_t FileLoader(uint8_t* buffer, const char* filename, int32_t maxsiz { more = true; name [len - 1]++; -#ifdef __WIN32__ +#ifdef _WIN32 /* memmove required: Overlapping addresses [Neb] */ memmove(&ext [1], &ext [0], 4); ext [0] = '.'; diff --git a/source/port.h b/source/port.h index c2a9b7f..fcfe836 100644 --- a/source/port.h +++ b/source/port.h @@ -18,7 +18,7 @@ #include "pixform.h" -#ifndef __WIN32__ +#ifndef _WIN32 #ifndef PATH_MAX #define PATH_MAX 1024 @@ -46,7 +46,7 @@ void _makepath(char* path, const char* drive, const char* dir, const char* fname, const char* ext); void _splitpath(const char* path, char* drive, char* dir, char* fname, char* ext); -#else /* __WIN32__ */ +#else /* _WIN32 */ #define strcasecmp stricmp #define strncasecmp strnicmp #endif @@ -54,7 +54,7 @@ void _splitpath(const char* path, char* drive, char* dir, char* fname, char* ext #define SLASH_STR "/" #define SLASH_CHAR '/' -#if defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__WIN32__) || defined(__alpha__) +#if defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(_XBOX1) || defined(__alpha__) #define FAST_LSB_WORD_ACCESS #elif defined(__MIPSEL__) /* On little-endian MIPS, a 16-bit word can be read directly from an address |