From acc18143c95fc09525c07200b8aba8ed09ec6251 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 4 May 2018 01:15:37 -0500 Subject: [PATCH] [ox/std] Fix new.hpp to correctly look for includes under MinGW (synced from 1e82dacd6dee6f05bd428c3525ec9175dde187f8) --- src/ox/std/new.hpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ox/std/new.hpp b/src/ox/std/new.hpp index 4562b7aae..f01758681 100644 --- a/src/ox/std/new.hpp +++ b/src/ox/std/new.hpp @@ -12,13 +12,12 @@ #include "types.hpp" -#if defined(_MSC_VER) +#if !defined(OX_USE_STDLIB) +#define ox_alloca(size) __builtin_alloca(size) +#elif defined(_MSC_VER) #include #define ox_alloca(size) _alloca(size) -#elif !defined(OX_USE_STDLIB) -#define ox_alloca(size) __builtin_alloca(size) -#else -#include +#elif __has_include() #include #define ox_alloca(size) alloca(size) #endif