From 3b1b5bb41d5de730a1b18af33036cf052e6f7b34 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sun, 12 Jan 2014 14:04:02 +0000 Subject: [PATCH] For DISABLEINLINING=1, apply __fastcall to make up for the lack of inlining. git-svn-id: https://svn.eduke32.com/eduke32@4247 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile.common | 2 +- polymer/eduke32/build/include/compat.h | 4 ++-- polymer/eduke32/source/actors_inline.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common index 1eb13a0b8..1e0b6bd2e 100644 --- a/polymer/eduke32/Makefile.common +++ b/polymer/eduke32/Makefile.common @@ -160,7 +160,7 @@ endif # CPLUSPLUS - 1 = enable C++ building # RELEASE - 1 = no debugging # DEBUGANYWAY - 1 = include debug symbols even when generating release code -# DISABLEINLINING - 1 = compile inline functions as extern instead of static inline +# DISABLEINLINING - 1 = compile inline functions as extern __fastcall instead of static inline # FORCEWARNINGS - 1 = do not disable any compiler warnings within the source # KRANDDEBUG - 1 = include logging of krand() calls for debugging the demo system # EFENCE - 1 = compile with Electric Fence for malloc() debugging diff --git a/polymer/eduke32/build/include/compat.h b/polymer/eduke32/build/include/compat.h index 432bb0c2b..2d141fb3b 100644 --- a/polymer/eduke32/build/include/compat.h +++ b/polymer/eduke32/build/include/compat.h @@ -169,8 +169,8 @@ static inline float nearbyintf(float x) # define EXTERN_INLINE static inline # define EXTERN_INLINE_HEADER static inline #else -# define EXTERN_INLINE -# define EXTERN_INLINE_HEADER extern +# define EXTERN_INLINE __fastcall +# define EXTERN_INLINE_HEADER extern __fastcall #endif #if !defined DEBUG_MAIN_ARRAYS diff --git a/polymer/eduke32/source/actors_inline.h b/polymer/eduke32/source/actors_inline.h index 8628783a0..534003f88 100644 --- a/polymer/eduke32/source/actors_inline.h +++ b/polymer/eduke32/source/actors_inline.h @@ -24,8 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __actors_inline_h__ #if KRANDDEBUG -# define ACTOR_INLINE -# define ACTOR_INLINE_HEADER extern +# define ACTOR_INLINE __fastcall +# define ACTOR_INLINE_HEADER extern __fastcall #else # define ACTOR_INLINE EXTERN_INLINE # define ACTOR_INLINE_HEADER EXTERN_INLINE_HEADER