diff options
| -rw-r--r-- | sokol_gfx.h | 3 | ||||
| -rw-r--r-- | util/sokol_debugtext.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sokol_gfx.h b/sokol_gfx.h index a1e369bd..39e59f57 100644 --- a/sokol_gfx.h +++ b/sokol_gfx.h @@ -641,9 +641,10 @@ typedef struct sg_range { size_t size; } sg_range; -// disabling this for every includer isn't great, but the warning is also quite pointless +// disabling this for every includer isn't great, but the warnings are also quite pointless #if defined(_MSC_VER) #pragma warning(disable:4221) /* /W4 only: nonstandard extension used: 'x': cannot be initialized using address of automatic variable 'y' */ +#pragma warning(disable:4202) /* VS2015: nonstandard extension used: non-constant aggregate initializer */ #endif #if defined(__cplusplus) #define SG_RANGE(x) sg_range{ &x, sizeof(x) } diff --git a/util/sokol_debugtext.h b/util/sokol_debugtext.h index 236d4778..00223c6b 100644 --- a/util/sokol_debugtext.h +++ b/util/sokol_debugtext.h @@ -443,6 +443,7 @@ typedef struct sdtx_range { // disabling this for every includer isn't great, but the warning is also quite pointless #if defined(_MSC_VER) #pragma warning(disable:4221) /* /W4 only: nonstandard extension used: 'x': cannot be initialized using address of automatic variable 'y' */ +#pragma warning(disable:4204) /* VS2015: nonstandard extension used: non-constant aggregate initializer */ #endif #if defined(__cplusplus) #define SDTX_RANGE(x) sdtx_range{ &x, sizeof(x) } |