From 273542f27d361d4d0e88f4f6a2f9b0ec4e73cb6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Mon, 30 Jun 2014 08:55:17 +0000 Subject: [PATCH] implemented ATTR_FORCE_INLINE for Visual Studio (nw) --- src/osd/osdcomm.h | 2 +- src/osd/windows/vconv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h index fc0d7d05d5c..4e00c7647c1 100644 --- a/src/osd/osdcomm.h +++ b/src/osd/osdcomm.h @@ -62,7 +62,7 @@ #define ATTR_MALLOC #define ATTR_PURE #define ATTR_CONST -#define ATTR_FORCE_INLINE +#define ATTR_FORCE_INLINE __forceinline #define ATTR_NONNULL(...) #define ATTR_DEPRECATED __declspec(deprecated) #define ATTR_HOT diff --git a/src/osd/windows/vconv.c b/src/osd/windows/vconv.c index eff69fcaf06..3e006fcfba3 100644 --- a/src/osd/windows/vconv.c +++ b/src/osd/windows/vconv.c @@ -68,7 +68,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 /wd4986 /wd4347 /wd4987 /wd4250 /wd4435 /wd4150 /wd4805" }, + { 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 /wd4987 /wd4250 /wd4435 /wd4150 /wd4805 /wd4141" }, { 0, "-Wall", "/W0" }, { VS7, "-Wno-unused", "/wd4100 /wd4101 /wd4102 /wd4505" }, { 0, "-Wno-sign-compare", "/wd4365 /wd4389 /wd4245 /wd4388" },