Merge branch 'master' of github.com:bkaradzic/bgfx

2016-06-02 16:38:33 -07:00 · 2016-06-02 16:38:33 -07:00 · 52d0563136
commit 52d0563136
parent 21518f201f 0ef14d0803
1 changed files with 4 additions and 0 deletions
--- a/3rdparty/ocornut-imgui/widgets/memory_editor.inl
+++ b/3rdparty/ocornut-imgui/widgets/memory_editor.inl
@ -1,3 +1,7 @@
+#ifdef _MSC_VER
+#   define snprintf _snprintf
+#endif
+
 namespace ImGui
 {
 //    const char* title;