dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(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)

Browse Source
This commit is contained in:
truebrain
2011-12-20 17:57:56 +00:00
parent 990045e2b3
commit aa1a0053b0
75 changed files with 673 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/stdafx.h
View File

@@ -121,7 +121,6 @@
/* Stuff for GCC */
#if defined(__GNUC__)
#define NORETURN __attribute__ ((noreturn))
#define FORCEINLINE inline
#define CDECL
#define __int64 long long
#define GCC_PACK __attribute__((packed))
@@ -137,7 +136,6 @@
#if defined(__WATCOMC__)
#define NORETURN
#define FORCEINLINE inline
#define CDECL
#define GCC_PACK
#define WARN_FORMAT(string, args)
@@ -185,8 +183,7 @@
#include <malloc.h> // alloca()
#define NORETURN __declspec(noreturn)
#define FORCEINLINE __forceinline
#define inline _inline
#define inline __forceinline
#if !defined(WINCE)
#define CDECL _cdecl
@@ -448,7 +445,7 @@ void NORETURN CDECL error(const char *str, ...) WARN_FORMAT(1, 2);
* Version of the standard free that accepts const pointers.
* @param ptr The data to free.
*/
static FORCEINLINE void free(const void *ptr)
static inline void free(const void *ptr)
{
free(const_cast<void *>(ptr));
}