diff --git a/desmume/src/filter/interp.h b/desmume/src/filter/interp.h index dad92d4c6..856a8192f 100644 --- a/desmume/src/filter/interp.h +++ b/desmume/src/filter/interp.h @@ -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) //{ diff --git a/desmume/src/types.h b/desmume/src/types.h index ce794d5a7..0b1368af5 100644 --- a/desmume/src/types.h +++ b/desmume/src/types.h @@ -19,6 +19,8 @@ #ifndef TYPES_HPP #define TYPES_HPP +#include + //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 {