diff options
| author | Andre Weissflog <floooh@gmail.com> | 2018-07-23 11:39:34 +0200 |
|---|---|---|
| committer | Andre Weissflog <floooh@gmail.com> | 2018-07-23 11:39:34 +0200 |
| commit | 4d17d1eb0650c2e4a41464ca4b9bb0c26fc26077 (patch) | |
| tree | dd0d88fdf309b7f4e24ad09cd650176b1775d965 /sokol_gfx.h | |
| parent | 9ccd46e586d4aaa7cfbf000125237693006e71b3 (diff) | |
Remaining /W4 fixes for VS2015, and added a _MSC_VER check around pragmas
Diffstat (limited to 'sokol_gfx.h')
| -rw-r--r-- | sokol_gfx.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sokol_gfx.h b/sokol_gfx.h index 0b6db63f..1ce63ec1 100644 --- a/sokol_gfx.h +++ b/sokol_gfx.h @@ -4080,9 +4080,11 @@ _SOKOL_PRIVATE void _sg_update_image(_sg_image* img, const sg_image_content* dat #define WIN32_LEAN_AND_MEAN #endif #include <windows.h> +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable:4201) /* nonstandard extension used: nameless struct/union */ #pragma warning(disable:4115) /* named type definition in parentheses */ +#endif #include <d3d11.h> #if (defined(WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) #pragma comment (lib, "WindowsApp.lib") @@ -4098,7 +4100,9 @@ _SOKOL_PRIVATE void _sg_update_image(_sg_image* img, const sg_image_content* dat #pragma comment (lib, "d3dcompiler.lib") #endif #endif +#ifdef _MSC_VER #pragma warning(pop) +#endif #ifdef __cplusplus extern "C" { |