From 1c9bec19993417b1f3b240f2bdb0745aa26c0cb3 Mon Sep 17 00:00:00 2001 From: truebrain Date: Tue, 20 Dec 2011 17:57:56 +0000 Subject: (svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC) --- src/core/endian_func.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/endian_func.hpp') diff --git a/src/core/endian_func.hpp b/src/core/endian_func.hpp index 186cb2a3b..ab5b18150 100644 --- a/src/core/endian_func.hpp +++ b/src/core/endian_func.hpp @@ -40,12 +40,12 @@ #define TO_LE32X(x) (x) #endif /* TTD_ENDIAN == TTD_BIG_ENDIAN */ -static FORCEINLINE uint16 ReadLE16Aligned(const void *x) +static inline uint16 ReadLE16Aligned(const void *x) { return FROM_LE16(*(const uint16*)x); } -static FORCEINLINE uint16 ReadLE16Unaligned(const void *x) +static inline uint16 ReadLE16Unaligned(const void *x) { #if OTTD_ALIGNMENT == 1 return ((const byte*)x)[0] | ((const byte*)x)[1] << 8; -- cgit v1.2.3-54-g00ecf