From 690a424ae8e8f549e05ba678b725aead3572cda9 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Thu, 26 Mar 2015 18:14:38 +0100 Subject: Move MSVC-specific inline definition to doomtype.h I think it fits better there and in case further inline fuctions are introduced in files other than i_scale.c, it should not be necessary to copy this definition around. --- src/doomtype.h | 4 ++++ src/i_scale.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/doomtype.h b/src/doomtype.h index 83b119a0..10820c12 100644 --- a/src/doomtype.h +++ b/src/doomtype.h @@ -21,6 +21,10 @@ #ifndef __DOOMTYPE__ #define __DOOMTYPE__ +#if defined(_MSC_VER) && !defined(__cplusplus) +#define inline __inline +#endif + // #define macros to provide functions missing in Windows. // Outside Windows, we use strings.h for str[n]casecmp. diff --git a/src/i_scale.c b/src/i_scale.c index 4d7bb22c..545a1f13 100644 --- a/src/i_scale.c +++ b/src/i_scale.c @@ -28,10 +28,6 @@ #include "m_argv.h" #include "z_zone.h" -#if defined(_MSC_VER) && !defined(__cplusplus) -#define inline __inline -#endif - // Should be I_VideoBuffer static byte *src_buffer; -- cgit v1.2.3