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/3rdparty/squirrel/include/squirrel.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/3rdparty') diff --git a/src/3rdparty/squirrel/include/squirrel.h b/src/3rdparty/squirrel/include/squirrel.h index fbbaa8e64..3be425304 100644 --- a/src/3rdparty/squirrel/include/squirrel.h +++ b/src/3rdparty/squirrel/include/squirrel.h @@ -35,6 +35,10 @@ to the following restrictions: extern "C" { #endif +#if defined(_MSC_VER) +# define inline __forceinline +#endif /* _MSC_VER */ + #if defined(_MSC_VER) && _MSC_VER >= 1400 // MSVC 2005 safety checks # pragma warning(disable: 4996) // '_wfopen' was declared deprecated # define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions -- cgit v1.2.3-70-g09d2