Merge remote-tracking branch 'floooh/master'

floooh · Feb 11, 2021 · a08bec7 · a08bec7
2 parents f32ce7e + 29bbcd8
commit a08bec7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/sokol_gfx.h b/sokol_gfx.h
@@ -2502,7 +2502,8 @@ inline int sg_append_buffer(sg_buffer buf_id, const sg_range& data) { return sg_
 #pragma warning(disable:4115)   /* named type definition in parentheses */
 #pragma warning(disable:4505)   /* unreferenced local function has been removed */
 #pragma warning(disable:4201)   /* nonstandard extension used: nameless struct/union (needed by d3d11.h) */
-#pragma warning(disable:4054)   /* 'type cast': from function pointer 'FARPROC' to data pointer 'void *' */
+#pragma warning(disable:4054)   /* 'type cast': from function pointer */
+#pragma warning(disable:4055)   /* 'type cast': from data pointer */
 #endif
 
 #if defined(SOKOL_GLCORE33) || defined(SOKOL_GLES2) || defined(SOKOL_GLES3)