mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r3236) - Fix: warnings about 'CDECL must be used with ...' on VS6
This commit is contained in:
parent
a090886073
commit
728aba9d7c
|
@ -20,9 +20,9 @@
|
|||
* Ugly, I know, but it works! */
|
||||
|
||||
# ifdef DEF_EVENTS
|
||||
void empty_function(PlayerID player, int event, ...) {}
|
||||
void CDECL empty_function(PlayerID player, int event, ...) {}
|
||||
# else
|
||||
extern void empty_function(PlayerID player, int event, ...);
|
||||
extern void CDECL empty_function(PlayerID player, int event, ...);
|
||||
# endif
|
||||
# define ai_event empty_function
|
||||
|
||||
|
|
|
@ -953,15 +953,8 @@ static void WriteMem(uint size)
|
|||
//********************************************
|
||||
|
||||
#if defined(WITH_ZLIB)
|
||||
|
||||
// This is needed to zlib uses the stdcall calling convention on visual studio
|
||||
#ifdef _MSC_VER
|
||||
# ifndef ZLIB_WINAPI
|
||||
# define ZLIB_WINAPI
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <zlib.h>
|
||||
|
||||
static z_stream _z;
|
||||
|
||||
static bool InitReadZlib(void)
|
||||
|
|
8
stdafx.h
8
stdafx.h
|
@ -142,6 +142,14 @@
|
|||
# undef TTD_ALIGNMENT_4
|
||||
# undef TTD_ALIGNMENT_2
|
||||
# define GCC_PACK
|
||||
|
||||
// This is needed to zlib uses the stdcall calling convention on visual studio, also used with libpng (VS6 warning)
|
||||
# if defined(WITH_ZLIB) || defined(WITH_PNG)
|
||||
# ifndef ZLIB_WINAPI
|
||||
# define ZLIB_WINAPI
|
||||
# endif
|
||||
# endif
|
||||
|
||||
#endif /* defined(_MSC_VER) */
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue