diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-15 15:04:33 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-15 15:53:48 -0700 |
| commit | 4e50731697e5b2f22662d494838d900b5e5f16fa (patch) | |
| tree | d655413127d04b46735040b866b1b9d8f2b116c4 /crawl-ref/source/AppHdr.h | |
| parent | 58076d0f9d92d901928f97723841295e96c19bd5 (diff) | |
| download | crawl-ref-4e50731697e5b2f22662d494838d900b5e5f16fa.tar.gz crawl-ref-4e50731697e5b2f22662d494838d900b5e5f16fa.zip | |
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 <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/AppHdr.h')
| -rw-r--r-- | crawl-ref/source/AppHdr.h | 6 |
1 files changed, 5 insertions, 1 deletions
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 |