Merge pull request #1319 from RyuKojiro/more_portable_alloca_include-ocornut

Simplify alloca.h include condition (fix for NetBSD)
8 years ago · 3420080a35
parent cb2775ae54 cf6ba9dd2d
commit 3420080a35
1 changed files with 3 additions and 3 deletions
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
@ -21,10 +21,10 @@
 #if !defined(alloca)
 #ifdef _WIN32
 #include <malloc.h>     // alloca
-#elif (defined(__FreeBSD__) || defined(FreeBSD_kernel) || defined(__DragonFly__)) && !defined(__GLIBC__)
-#include <stdlib.h>     // alloca. FreeBSD uses stdlib.h unless GLIBC
+#elif !defined(__GLIBC__)
+#include <stdlib.h>     // alloca
 #else
-#include <alloca.h>     // alloca
+#include <alloca.h>     // alloca. glibc has an alloca specific header
 #endif
 #endif