Merge pull request #1319 from RyuKojiro/more_portable_alloca_include-ocornut

Simplify alloca.h include condition (fix for NetBSD)
This commit is contained in:
omar 2017-09-11 11:00:23 +02:00 committed by GitHub
commit 3420080a35

View File

@ -21,10 +21,10 @@
#if !defined(alloca) #if !defined(alloca)
#ifdef _WIN32 #ifdef _WIN32
#include <malloc.h> // alloca #include <malloc.h> // alloca
#elif (defined(__FreeBSD__) || defined(FreeBSD_kernel) || defined(__DragonFly__)) && !defined(__GLIBC__) #elif !defined(__GLIBC__)
#include <stdlib.h> // alloca. FreeBSD uses stdlib.h unless GLIBC #include <stdlib.h> // alloca
#else #else
#include <alloca.h> // alloca #include <alloca.h> // alloca. glibc has an alloca specific header
#endif #endif
#endif #endif