diff options
| author | Fabian Greffrath | 2015-03-26 18:14:38 +0100 |
|---|---|---|
| committer | Fabian Greffrath | 2015-03-26 18:14:38 +0100 |
| commit | 690a424ae8e8f549e05ba678b725aead3572cda9 (patch) | |
| tree | 5e79bff73743f1d9e3849194a3c40873d7392111 /src | |
| parent | ad027ef6dbfeebabe0e6701eec968e9d474e497f (diff) | |
| download | chocolate-doom-690a424ae8e8f549e05ba678b725aead3572cda9.tar.gz chocolate-doom-690a424ae8e8f549e05ba678b725aead3572cda9.tar.bz2 chocolate-doom-690a424ae8e8f549e05ba678b725aead3572cda9.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/doomtype.h | 4 | ||||
| -rw-r--r-- | 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; |