From 68bc1d19017f2420699df3ae2aa363756871826f Mon Sep 17 00:00:00 2001 From: yoshihiropsp Date: Fri, 26 Mar 2010 15:38:56 +0000 Subject: [PATCH] #undef min max and fix forceinline for XBOX360 --- desmume/src/metaspu/metaspu.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/desmume/src/metaspu/metaspu.h b/desmume/src/metaspu/metaspu.h index 52ae480d2..968db40dd 100644 --- a/desmume/src/metaspu/metaspu.h +++ b/desmume/src/metaspu/metaspu.h @@ -29,14 +29,27 @@ #include +#ifdef _XBOX +#undef min +#undef max +#endif + template< typename T > +#ifdef _XBOX +FORCEINLINE void Clampify( T& src, T min, T max ) +#else static FORCEINLINE void Clampify( T& src, T min, T max ) +#endif { src = std::min( std::max( src, min ), max ); } template< typename T > +#ifdef _XBOX +FORCEINLINE T GetClamped( T src, T min, T max ) +#else static FORCEINLINE T GetClamped( T src, T min, T max ) +#endif { return std::min( std::max( src, min ), max ); }