summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2005-11-26 12:57:42 +0000
committerDarkvater <darkvater@openttd.org>2005-11-26 12:57:42 +0000
commit728aba9d7cf41f1aaba655b89da1fa687ecded10 (patch)
tree70ff31422b33d818ffb0291281d2327d83291d64
parenta090886073dc6167aad68700bed4681d775ca5f3 (diff)
downloadopenttd-728aba9d7cf41f1aaba655b89da1fa687ecded10.tar.xz
(svn r3236) - Fix: warnings about 'CDECL must be used with ...' on VS6
-rw-r--r--ai/ai_event.h4
-rw-r--r--saveload.c9
-rw-r--r--stdafx.h8
3 files changed, 11 insertions, 10 deletions
diff --git a/ai/ai_event.h b/ai/ai_event.h
index 7f96f71b8..1f49f338b 100644
--- a/ai/ai_event.h
+++ b/ai/ai_event.h
@@ -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
diff --git a/saveload.c b/saveload.c
index dc7485eac..8cfc878bb 100644
--- a/saveload.c
+++ b/saveload.c
@@ -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)
diff --git a/stdafx.h b/stdafx.h
index 74c44e46d..b42b3688f 100644
--- a/stdafx.h
+++ b/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) */