From fca55e374145de586143a340aa46a72d4f0ea47a Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 24 Nov 2004 13:19:48 +0000 Subject: (svn r793) Merge INLINE -> inline replacement (revision 376) --- stdafx.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'stdafx.h') diff --git a/stdafx.h b/stdafx.h index 6785f8552..94524f6f5 100644 --- a/stdafx.h +++ b/stdafx.h @@ -43,7 +43,6 @@ #if defined(__GNUC__) # define NORETURN # define FORCEINLINE inline -# define INLINE inline # define CDECL //#include //#include @@ -62,7 +61,7 @@ # include // alloca() # define NORETURN __declspec(noreturn) # define FORCEINLINE __forceinline -# define INLINE _inline +# define inline _inline # define CDECL _cdecl # define NOT_REACHED() _assume(0) # define snprintf _snprintf @@ -116,10 +115,10 @@ typedef unsigned __int64 uint64; # define TTD_ALIGNMENT_2 # define TTD_ALIGNMENT_4 -static uint32 INLINE TO_LE32(uint32 x) { return BSWAP32(x); } -static uint16 INLINE TO_LE16(uint16 x) { return BSWAP16(x); } -static uint32 INLINE FROM_LE32(uint32 x) { return BSWAP32(x); } -static uint16 INLINE FROM_LE16(uint16 x) { return BSWAP16(x); } +static inline uint32 TO_LE32(uint32 x) { return BSWAP32(x); } +static inline uint16 TO_LE16(uint16 x) { return BSWAP16(x); } +static inline uint32 FROM_LE32(uint32 x) { return BSWAP32(x); } +static inline uint16 FROM_LE16(uint16 x) { return BSWAP16(x); } #define TO_BE32(x) x #define TO_BE16(x) x #define FROM_BE32(x) x -- cgit v1.2.3-54-g00ecf