From c6d2441db30e4f55714ffd2eaae48668766e4cbd Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 11 Sep 2009 08:39:09 +0000 Subject: Don't abuse FORCEINLINE svn-id: r44025 --- engines/m4/m4.h | 8 ++++---- tools/create_kyradat/util.h | 18 ++++++++---------- tools/create_teenagent/util.h | 18 ++++++++---------- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/engines/m4/m4.h b/engines/m4/m4.h index 7378dbf755..b793cfbbae 100644 --- a/engines/m4/m4.h +++ b/engines/m4/m4.h @@ -99,11 +99,11 @@ struct M4GameDescription; #define GAME_FRAME_DELAY 50 -FORCEINLINE void str_lower(char *s) { while (*s) { *s = tolower(*s); s++; } } -FORCEINLINE void str_upper(char *s) { while (*s) { *s = toupper(*s); s++; } } +inline void str_lower(char *s) { while (*s) { *s = tolower(*s); s++; } } +inline void str_upper(char *s) { while (*s) { *s = toupper(*s); s++; } } -FORCEINLINE long FixedMul(long a, long b) { return (long)(((float)a * (float)b) / 65536.0); } -FORCEINLINE long FixedDiv(long a, long b) { return (long)(((float)a / (float)b) * 65536.0); } +inline long FixedMul(long a, long b) { return (long)(((float)a * (float)b) / 65536.0); } +inline long FixedDiv(long a, long b) { return (long)(((float)a / (float)b) * 65536.0); } class M4Engine : public Engine { private: diff --git a/tools/create_kyradat/util.h b/tools/create_kyradat/util.h index 8ce6e8acb2..3938f2ab56 100644 --- a/tools/create_kyradat/util.h +++ b/tools/create_kyradat/util.h @@ -156,22 +156,20 @@ static inline uint16 SWAP_16(uint16 a) { return ((a >> 8) & 0xFF) | ((a << 8) & 0xFF00); } -#define FORCEINLINE static inline - -FORCEINLINE uint16 READ_LE_UINT16(const void *ptr) { +static inline uint16 READ_LE_UINT16(const void *ptr) { const byte *b = (const byte *)ptr; return (b[1] << 8) + b[0]; } -FORCEINLINE uint32 READ_LE_UINT32(const void *ptr) { +static inline uint32 READ_LE_UINT32(const void *ptr) { const byte *b = (const byte *)ptr; return (b[3] << 24) + (b[2] << 16) + (b[1] << 8) + (b[0]); } -FORCEINLINE void WRITE_LE_UINT16(void *ptr, uint16 value) { +static inline void WRITE_LE_UINT16(void *ptr, uint16 value) { byte *b = (byte *)ptr; b[0] = (byte)(value >> 0); b[1] = (byte)(value >> 8); } -FORCEINLINE void WRITE_LE_UINT32(void *ptr, uint32 value) { +static inline void WRITE_LE_UINT32(void *ptr, uint32 value) { byte *b = (byte *)ptr; b[0] = (byte)(value >> 0); b[1] = (byte)(value >> 8); @@ -179,20 +177,20 @@ FORCEINLINE void WRITE_LE_UINT32(void *ptr, uint32 value) { b[3] = (byte)(value >> 24); } -FORCEINLINE uint16 READ_BE_UINT16(const void *ptr) { +static inline uint16 READ_BE_UINT16(const void *ptr) { const byte *b = (const byte *)ptr; return (b[0] << 8) + b[1]; } -FORCEINLINE uint32 READ_BE_UINT32(const void *ptr) { +static inline uint32 READ_BE_UINT32(const void *ptr) { const byte *b = (const byte*)ptr; return (b[0] << 24) + (b[1] << 16) + (b[2] << 8) + (b[3]); } -FORCEINLINE void WRITE_BE_UINT16(void *ptr, uint16 value) { +static inline void WRITE_BE_UINT16(void *ptr, uint16 value) { byte *b = (byte *)ptr; b[0] = (byte)(value >> 8); b[1] = (byte)(value >> 0); } -FORCEINLINE void WRITE_BE_UINT32(void *ptr, uint32 value) { +static inline void WRITE_BE_UINT32(void *ptr, uint32 value) { byte *b = (byte *)ptr; b[0] = (byte)(value >> 24); b[1] = (byte)(value >> 16); diff --git a/tools/create_teenagent/util.h b/tools/create_teenagent/util.h index 8ce6e8acb2..3938f2ab56 100644 --- a/tools/create_teenagent/util.h +++ b/tools/create_teenagent/util.h @@ -156,22 +156,20 @@ static inline uint16 SWAP_16(uint16 a) { return ((a >> 8) & 0xFF) | ((a << 8) & 0xFF00); } -#define FORCEINLINE static inline - -FORCEINLINE uint16 READ_LE_UINT16(const void *ptr) { +static inline uint16 READ_LE_UINT16(const void *ptr) { const byte *b = (const byte *)ptr; return (b[1] << 8) + b[0]; } -FORCEINLINE uint32 READ_LE_UINT32(const void *ptr) { +static inline uint32 READ_LE_UINT32(const void *ptr) { const byte *b = (const byte *)ptr; return (b[3] << 24) + (b[2] << 16) + (b[1] << 8) + (b[0]); } -FORCEINLINE void WRITE_LE_UINT16(void *ptr, uint16 value) { +static inline void WRITE_LE_UINT16(void *ptr, uint16 value) { byte *b = (byte *)ptr; b[0] = (byte)(value >> 0); b[1] = (byte)(value >> 8); } -FORCEINLINE void WRITE_LE_UINT32(void *ptr, uint32 value) { +static inline void WRITE_LE_UINT32(void *ptr, uint32 value) { byte *b = (byte *)ptr; b[0] = (byte)(value >> 0); b[1] = (byte)(value >> 8); @@ -179,20 +177,20 @@ FORCEINLINE void WRITE_LE_UINT32(void *ptr, uint32 value) { b[3] = (byte)(value >> 24); } -FORCEINLINE uint16 READ_BE_UINT16(const void *ptr) { +static inline uint16 READ_BE_UINT16(const void *ptr) { const byte *b = (const byte *)ptr; return (b[0] << 8) + b[1]; } -FORCEINLINE uint32 READ_BE_UINT32(const void *ptr) { +static inline uint32 READ_BE_UINT32(const void *ptr) { const byte *b = (const byte*)ptr; return (b[0] << 24) + (b[1] << 16) + (b[2] << 8) + (b[3]); } -FORCEINLINE void WRITE_BE_UINT16(void *ptr, uint16 value) { +static inline void WRITE_BE_UINT16(void *ptr, uint16 value) { byte *b = (byte *)ptr; b[0] = (byte)(value >> 8); b[1] = (byte)(value >> 0); } -FORCEINLINE void WRITE_BE_UINT32(void *ptr, uint32 value) { +static inline void WRITE_BE_UINT32(void *ptr, uint32 value) { byte *b = (byte *)ptr; b[0] = (byte)(value >> 24); b[1] = (byte)(value >> 16); -- cgit v1.2.3