From 4e50731697e5b2f22662d494838d900b5e5f16fa Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Thu, 15 Oct 2009 15:04:33 -0700 Subject: AppHdr.h: move warning-disabler for 4290 to before externs.h include externs.h is where the warning is generated, so... Signed-off-by: Steven Noonan --- crawl-ref/source/AppHdr.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index 5787f9aaf6..97ceda1b6a 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -21,6 +21,11 @@ #include "platform.h" +#ifdef TARGET_COMPILER_VC +/* Disable warning about the way VC handles the throw() specifier */ +#pragma warning (disable: 4290) +#endif + // The maximum memory that the user-script Lua interpreter can // allocate, in kilobytes. This limit is enforced to prevent // badly-written or malicious user scripts from consuming too much @@ -522,7 +527,6 @@ inline void UNUSED(const volatile T &) #ifdef TARGET_COMPILER_VC #include "libw32c.h" -#pragma warning (disable: 4290) #endif #endif -- cgit v1.2.3-54-g00ecf