summaryrefslogtreecommitdiff
path: root/stdafx.h
diff options
context:
space:
mode:
authorDarkvater <Darkvater@openttd.org>2006-11-18 00:14:43 +0000
committerDarkvater <Darkvater@openttd.org>2006-11-18 00:14:43 +0000
commit1a87a33911c26b69a1143709410a7837d84e24cd (patch)
tree75a3954c33043c724e452fafd6ef0b60291b6eb6 /stdafx.h
parent20cf41522e61a34b97f7f24487dd67231a929bef (diff)
downloadopenttd-1a87a33911c26b69a1143709410a7837d84e24cd.tar.xz
(svn r7200) -Codechange: remove unneeded redraw (console.c), coding style, use FindWindowById
instead of _windows loop (viewport.c), remove dump-code (mixer.c), MSVC6 borkdness in stdafx.h, constness (viewport.c), variable localization (win32.c), comments (window.c)
Diffstat (limited to 'stdafx.h')
-rw-r--r--stdafx.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/stdafx.h b/stdafx.h
index 1db6ed38e..e22a2494b 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -102,16 +102,11 @@
# define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
# pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data
# pragma warning(disable: 4761) // integral size mismatch in argument : conversion supplied
-# if _MSC_VER < 1300 // MSVC 6 borkdness
-# pragma warning(disable: 4018) // 'expression' : signed/unsigned mismatch
-# pragma warning(disable: 4305) // 'identifier' : truncation from 'type1' to 'type2'
-# pragma warning(disable: 4786) // 'identifier' : identifier was truncated to '255' characters in the browser information
-# endif /* _MSC_VER < 1300 */
+
# if _MSC_VER >= 1400 // MSVC 2005 safety checks
# pragma warning(disable: 4996) // 'strdup' was declared deprecated
# define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions
-# pragma comment(linker, "/NODEFAULTLIB:LIBC.LIB")
- // allow linking to non-recompiled libs
+# pragma comment(linker, "/NODEFAULTLIB:LIBCMT.LIB") // allow linking to non-recompiled libs
# endif /* _MSC_VER >= 1400 */
# include <malloc.h> // alloca()