diff options
| author | notaz | 2015-01-25 23:21:40 +0200 |
|---|---|---|
| committer | notaz | 2015-01-25 23:21:40 +0200 |
| commit | 4e9adec1930817da2031fd044dc74c0f454a0079 (patch) | |
| tree | 854c202544c75e486d4243b34366162f03f082eb /libpcsxcore/new_dynarec/emu_if.c | |
| parent | be1294d017cba3f18cf66597f0cbed207fed26bf (diff) | |
| parent | ba10822d813767632c528102055e3eeb54730b2c (diff) | |
| download | pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.tar.gz pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.tar.bz2 pcsx_rearmed-4e9adec1930817da2031fd044dc74c0f454a0079.zip | |
Merge branch 'upstream' into libretro
Diffstat (limited to 'libpcsxcore/new_dynarec/emu_if.c')
| -rw-r--r-- | libpcsxcore/new_dynarec/emu_if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c index b7a2489..092c8ae 100644 --- a/libpcsxcore/new_dynarec/emu_if.c +++ b/libpcsxcore/new_dynarec/emu_if.c @@ -305,7 +305,7 @@ static int ari64_init() { extern void (*psxCP2[64])(); extern void psxNULL(); - extern u_char *out; + extern unsigned char *out; size_t i; new_dynarec_init(); @@ -438,7 +438,7 @@ int new_dynarec_hacks; void *psxH_ptr; void *zeromem_ptr; u8 zero_mem[0x1000]; -u_char *out; +unsigned char *out; void *mem_rtab; void *scratch_buf_ptr; void new_dynarec_init() { (void)ari64_execute; } |