diff options
author | neonloop | 2021-04-03 16:57:56 +0000 |
---|---|---|
committer | neonloop | 2021-04-03 16:57:56 +0000 |
commit | f81b441134306c96c0c06fa0cce77d1f78c274e4 (patch) | |
tree | e728393188f4f0fe65338d1f7df6c6bdde0288d3 /frontend | |
parent | 0688325a887ddfc24f5904204a4635af66d85444 (diff) | |
parent | 3993490baa28964c5e3e8f879b58147184d9b0f7 (diff) | |
download | pcsx_rearmed-f81b441134306c96c0c06fa0cce77d1f78c274e4.tar.gz pcsx_rearmed-f81b441134306c96c0c06fa0cce77d1f78c274e4.tar.bz2 pcsx_rearmed-f81b441134306c96c0c06fa0cce77d1f78c274e4.zip |
Merge remote-tracking branch 'libretro/master' into trimui-s
Diffstat (limited to 'frontend')
-rw-r--r-- | frontend/libretro.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontend/libretro.c b/frontend/libretro.c index e588b8d..77c23c0 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -2774,7 +2774,7 @@ void retro_init(void) msg_interface_version = 0; environ_cb(RETRO_ENVIRONMENT_GET_MESSAGE_INTERFACE_VERSION, &msg_interface_version); -#ifdef __MACH__ +#if defined(__MACH__) && !defined(TVOS) // magic sauce to make the dynarec work on iOS syscall(SYS_ptrace, 0 /*PTRACE_TRACEME*/, 0, 0, 0); #endif |