ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use retro_miscellaneous.h

This commit is contained in:
twinaphex 2016-08-16 07:42:12 +02:00 committed by zeromus
parent 833ac7b658
commit 2a71c9c6fb
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/filter/interp.h
View File

@ -277,8 +277,6 @@ static int interp_32_diff(u32 p1, u32 p2)
#define INTERP_LIMIT2 (96000)
//#define ABS(x) ((x) < 0 ? -(x) : (x))
static FORCEINLINE u32 ABS(s32 x) { return (x+(x>>31))^(x>>31); } // faster
#define MAX(x,y) ((x) > (y) ? (x) : (y))
#define MIN(x,y) ((x) < (y) ? (x) : (y))
//
//static int interp_16_diff2(u16 p1, u16 p2)
//{

4
desmume/src/types.h
View File

@ -19,6 +19,8 @@
#ifndef TYPES_HPP
#define TYPES_HPP
#include <retro_miscellaneous.h>
//analyze microsoft compilers
#ifdef _MSC_VER
#define HOST_WINDOWS
@ -303,8 +305,6 @@ typedef int desmume_BOOL;
#define MB(x) ((x)*1024*1024)
#define KB(x) ((x)*1024)
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
#define CPU_STR(c) ((c==ARM9)?"ARM9":"ARM7")
typedef enum
{