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

Get rid of INLINE macro - handled by retro_inline.h

This commit is contained in:
twinaphex 2016-08-16 07:47:49 +02:00 committed by zeromus
parent 2a71c9c6fb
commit 629681b094
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
desmume/src/types.h
View File

@ -20,6 +20,7 @@
#define TYPES_HPP #define TYPES_HPP
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include <retro_inline.h>
//analyze microsoft compilers //analyze microsoft compilers
#ifdef _MSC_VER #ifdef _MSC_VER
@ -146,14 +147,6 @@
#define _CDECL_ #define _CDECL_
#endif #endif
#ifndef INLINE
#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
#define INLINE _inline
#else
#define INLINE inline
#endif
#endif
#ifndef FORCEINLINE #ifndef FORCEINLINE
#if defined(_MSC_VER) || defined(__INTEL_COMPILER) #if defined(_MSC_VER) || defined(__INTEL_COMPILER)
#define FORCEINLINE __forceinline #define FORCEINLINE __forceinline
@ -404,16 +397,6 @@ inline u16 de16lsb(u8 *morp)
return morp[0]|(morp[1]<<8); return morp[0]|(morp[1]<<8);
} }
#ifndef ARRAY_SIZE
//taken from winnt.h
extern "C++" // templates cannot be declared to have 'C' linkage
template <typename T, size_t N>
char (*BLAHBLAHBLAH( UNALIGNED T (&)[N] ))[N];
#define ARRAY_SIZE(A) (sizeof(*BLAHBLAHBLAH(A)))
#endif
//fairly standard for loop macros //fairly standard for loop macros
#define MACRODO1(TRICK,TODO) { const size_t X = TRICK; TODO; } #define MACRODO1(TRICK,TODO) { const size_t X = TRICK; TODO; }
#define MACRODO2(X,TODO) { MACRODO1((X),TODO) MACRODO1(((X)+1),TODO) } #define MACRODO2(X,TODO) { MACRODO1((X),TODO) MACRODO1(((X)+1),TODO) }