From 25cc4c2db176543952c947dc82b34a94138e441e Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 27 Jul 2015 16:36:05 -0400 Subject: [PATCH] Fixed compile error on MinGW due to including --- rijndael.cpp | 4 +--- stdcpp.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rijndael.cpp b/rijndael.cpp index b3c55e2e..dac0b530 100644 --- a/rijndael.cpp +++ b/rijndael.cpp @@ -70,13 +70,11 @@ being unloaded from L1 cache, until that round is finished. #ifndef CRYPTOPP_GENERATE_X64_MASM #include "rijndael.h" +#include "stdcpp.h" #include "misc.h" #include "cpu.h" #include "trap.h" -// Non-conforming C++ program die to alloca. See http://stackoverflow.com/q/31645309/608639. -#include - #if GCC_DIAGNOSTIC_AWARE # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wunused-function" diff --git a/stdcpp.h b/stdcpp.h index 955076e5..ec904765 100644 --- a/stdcpp.h +++ b/stdcpp.h @@ -50,7 +50,7 @@ // #endif // Nearly everyone gets alloca from . -#ifdef CRYPTOPP_UNIX_AVAILABLE +#if defined(CRYPTOPP_UNIX_AVAILABLE) && !defined(__MINGW32__) && !defined(__BORLANDC__) # include #endif