X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=pico%2Fpico_int.h;h=e7f530fe85b4c901669dcaa197788ad783aa4f4c;hb=5e2c5b93a09dce5661799d995544665b31d4ca6f;hp=48d5237237164d762ecaae602121982a844bef73;hpb=6901d0e45dbf77671d86cb9bf9af98c486db97c8;p=picodrive.git diff --git a/pico/pico_int.h b/pico/pico_int.h index 48d5237..e7f530f 100644 --- a/pico/pico_int.h +++ b/pico/pico_int.h @@ -32,6 +32,11 @@ extern "C" { #endif +#ifdef _MSC_VER +#define snprintf _snprintf +#define strcasecmp _stricmp +#define strncasecmp _strnicmp +#endif // ----------------------- 68000 CPU ----------------------- #ifdef EMU_C68K @@ -434,15 +439,7 @@ typedef struct unsigned char pcm_ram[0x10000]; unsigned char pcm_ram_b[0x10][0x1000]; }; - union { - unsigned char s68k_regs[0x200]; // 110000: GA, not CPU regs - union { - struct { - unsigned char h; - unsigned char l; - } byte; - } regs[0x200/2]; - }; + unsigned char s68k_regs[0x200]; // 110000: GA, not CPU regs unsigned char bram[0x2000]; // 110200: 8K struct mcd_misc m; // 112200: misc struct mcd_pcm pcm; // 112240: @@ -776,7 +773,7 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead8(unsigned int a); extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp); // misc.c -PICO_INTERNAL_ASM void memcpy16(unsigned short *dest, unsigned short *src, int count); +PICO_INTERNAL_ASM void pmemcpy16(unsigned short *dest, unsigned short *src, int count); PICO_INTERNAL_ASM void memcpy16bswap(unsigned short *dest, void *src, int count); PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count); // 32bit word count PICO_INTERNAL_ASM void memset32(int *dest, int c, int count); @@ -915,7 +912,7 @@ void REGPARM(3) sh2_peripheral_write32(unsigned int a, unsigned int d, SH2 *sh2) #endif /* avoid dependency on newer glibc */ -static __inline int isspace_(int c) +static INLINE int isspace_(int c) { return (0x09 <= c && c <= 0x0d) || c == ' '; }