diff options
| author | dankcushions | 2016-04-22 15:05:41 +0100 |
|---|---|---|
| committer | dankcushions | 2016-04-22 15:05:41 +0100 |
| commit | cb4d282af668df3bdbd428be5a5ad26996cd0f4f (patch) | |
| tree | 93e9704ebb9395c4f6c7bab847d9df7abb005d3d /libpcsxcore/cdrom.c | |
| parent | 4ed8f00a1221b15925117f1c7413b4640e6e7198 (diff) | |
| parent | 4da64aea132e752bfea9448238599653e741b465 (diff) | |
| download | pcsx_rearmed-cb4d282af668df3bdbd428be5a5ad26996cd0f4f.tar.gz pcsx_rearmed-cb4d282af668df3bdbd428be5a5ad26996cd0f4f.tar.bz2 pcsx_rearmed-cb4d282af668df3bdbd428be5a5ad26996cd0f4f.zip | |
Merge branch 'master' of https://github.com/notaz/pcsx_rearmed into notaz-master
Diffstat (limited to 'libpcsxcore/cdrom.c')
| -rw-r--r-- | libpcsxcore/cdrom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 556b512..17d65ab 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -24,6 +24,7 @@ #include "cdrom.h" #include "ppf.h" #include "psxdma.h" +#include "arm_features.h" /* logging */ #if 0 @@ -1006,7 +1007,7 @@ finish: #endif } -#ifdef __ARM_ARCH_7A__ +#ifdef HAVE_ARMV7 #define ssat32_to_16(v) \ asm("ssat %0,#16,%1" : "=r" (v) : "r" (v)) #else |