diff options
author | Nathan Woods <npwoods@mess.org> | 2012-12-22 17:13:18 +0000 |
---|---|---|
committer | Nathan Woods <npwoods@mess.org> | 2012-12-22 17:13:18 +0000 |
commit | a21d4c24702638e721b64eb9b697bccffce6bd24 (patch) | |
tree | 39ea0e10179bb9d55ad5dbeff2ab66279002b622 /src/osd/windows | |
parent | 02e27f9ff9517be674e7c7317af1d0103e77e9bc (diff) |
MSVC compilation fixes.
Diffstat (limited to 'src/osd/windows')
-rw-r--r-- | src/osd/windows/eivc.h | 6 | ||||
-rw-r--r-- | src/osd/windows/vconv.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/osd/windows/eivc.h b/src/osd/windows/eivc.h index 6dc54d93b31..bd70470de7c 100644 --- a/src/osd/windows/eivc.h +++ b/src/osd/windows/eivc.h @@ -45,7 +45,13 @@ #define __EIVC__ #if (_MSC_VER >= 1400) + +// need to ignore 'nonstandard extension used' warning in setjmp.h +#pragma warning(push) +#pragma warning(disable: 4987) #include <intrin.h> +#pragma warning(pop) + #else extern "C" long __cdecl _InterlockedIncrement(long volatile *); extern "C" long __cdecl _InterlockedDecrement(long volatile *); diff --git a/src/osd/windows/vconv.c b/src/osd/windows/vconv.c index e3cc1e1866c..0e8319a48e9 100644 --- a/src/osd/windows/vconv.c +++ b/src/osd/windows/vconv.c @@ -101,7 +101,7 @@ static const translation_info gcc_translate[] = { 0, "-fomit-frame-pointer", "" }, { 0, "-Werror", "/WX" }, //{ VS7, "-Wall", "/Wall /W3 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826" }, - { VS7, "-Wall", "/Wall /W4 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826 /wd4820 /wd4514 /wd4668 /wd4127 /wd4625 /wd4626 /wd4512 /wd4100 /wd4310 /wd4571 /wd4061 /wd4131 /wd4255 /wd4510 /wd4610 /wd4505 /wd4324 /wd4611 /wd4201 /wd4189 /wd4296" }, + { VS7, "-Wall", "/Wall /W4 /wd4003 /wd4018 /wd4146 /wd4242 /wd4244 /wd4619 /wd4702 /wd4706 /wd4710 /wd4711 /wd4738 /wd4826 /wd4820 /wd4514 /wd4668 /wd4127 /wd4625 /wd4626 /wd4512 /wd4100 /wd4310 /wd4571 /wd4061 /wd4131 /wd4255 /wd4510 /wd4610 /wd4505 /wd4324 /wd4611 /wd4201 /wd4189 /wd4296 /wd4986 /wd4347" }, { 0, "-Wall", "/W0" }, { VS7, "-Wno-unused", "/wd4100 /wd4101 /wd4102 /wd4505" }, { 0, "-Wno-sign-compare", "/wd4365 /wd4389 /wd4245" }, |