From: twinaphex <libretro@gmail.com>
Date: Wed, 3 May 2017 01:55:32 +0000 (+0200)
Subject: Merge https://github.com/notaz/pcsx_rearmed
X-Git-Tag: r24l~789
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0a02fdcf0043d9afa9c4b26c38c28cb761e1e10;p=pcsx_rearmed.git

Merge https://github.com/notaz/pcsx_rearmed
---

f0a02fdcf0043d9afa9c4b26c38c28cb761e1e10
diff --cc libpcsxcore/new_dynarec/new_dynarec.c
index d2cd270d,cd63d2bf..dfa17a77
--- a/libpcsxcore/new_dynarec/new_dynarec.c
+++ b/libpcsxcore/new_dynarec/new_dynarec.c
@@@ -7119,15 -7068,14 +7119,15 @@@ void new_dynarec_init(void
      SysPrintf("mmap() failed: %s\n", strerror(errno));
      abort();
    }
 -  #endif
 +#endif
  #else
 -  #ifndef NO_WRITE_EXEC
 +#ifndef NO_WRITE_EXEC
    // not all systems allow execute in data segment by default
-   if (mprotect((void*)BASE_ADDR, 1<<TARGET_SIZE_2, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
+   if (mprotect((void *)BASE_ADDR, 1<<TARGET_SIZE_2, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
      SysPrintf("mprotect() failed: %s\n", strerror(errno));
 -  #endif
  #endif
 +#endif
 +
    out=(u_char *)BASE_ADDR;
    cycle_multiplier=200;
    new_dynarec_clear_full();