diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2010-10-15 02:17:01 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2010-10-15 02:17:01 +0200 |
| commit | f7717330f1e10f18464a68edc1b595dd6a6b9527 (patch) | |
| tree | daff37556fe8b661c5d268b1429f73ae6669153d /crawl-ref/source/msvc.h | |
| parent | e7572d74b30900124d9a896843f42b1c957d20c2 (diff) | |
| parent | 448542e984ad690be6be5869e0f47072981ed2ce (diff) | |
| download | crawl-ref-f7717330f1e10f18464a68edc1b595dd6a6b9527.tar.gz crawl-ref-f7717330f1e10f18464a68edc1b595dd6a6b9527.zip | |
Merge branch 'master' into unicode
Diffstat (limited to 'crawl-ref/source/msvc.h')
| -rw-r--r-- | crawl-ref/source/msvc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/msvc.h b/crawl-ref/source/msvc.h index 485ac8c66f..fd4e88131a 100644 --- a/crawl-ref/source/msvc.h +++ b/crawl-ref/source/msvc.h @@ -30,16 +30,16 @@ ((void) memcpy(&(dst), &(src), sizeof(va_list))) #endif -#pragma warning( disable : 4290 ) -#pragma warning( disable : 4351 ) +#pragma warning(disable : 4290) +#pragma warning(disable : 4351) // bool -> int -#pragma warning( disable : 4800 ) +#pragma warning(disable : 4800) // struct vs class XXX: fix these some day! -#pragma warning( disable : 4099 ) +#pragma warning(disable : 4099) // truncating conversions XXX: fix these too! -#pragma warning( disable : 4244 ) +#pragma warning(disable : 4244) inline double round(double x) |