diff options
| author | truebrain <truebrain@openttd.org> | 2011-12-20 17:57:56 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2011-12-20 17:57:56 +0000 |
| commit | 1c9bec19993417b1f3b240f2bdb0745aa26c0cb3 (patch) | |
| tree | d09407cc962ee87ac1bbbbc60951cad74c6b1db7 /src/core/endian_func.hpp | |
| parent | 7a38642a1c83531a65907ae784bc03a82d35132a (diff) | |
| download | openttd-1c9bec19993417b1f3b240f2bdb0745aa26c0cb3.tar.xz | |
(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)
Diffstat (limited to 'src/core/endian_func.hpp')
| -rw-r--r-- | src/core/endian_func.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |