mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-16 00:54:19 +00:00
Code Activity

Merge branch 'master' into navigation

Browse source 
# Conflicts:
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar 2017-12-11 16:28:47 +01:00
commit 38bfdb357e
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
imgui_draw.cpp
View file

@ -22,6 +22,9 @@
#if !defined(alloca)
#ifdef _WIN32
#include <malloc.h> // alloca
#if !defined(alloca)
#define alloca _alloca // for clang with MS Codegen
#endif
#elif defined(__GLIBC__) || defined(__sun)
#include <alloca.h> // alloca
#else