From ccd2e602a0c4dd4d8e323075720d3f84ae1fc4a5 Mon Sep 17 00:00:00 2001 From: zz4032 Date: Tue, 23 Jun 2020 19:55:54 +0200 Subject: [PATCH 1/3] Adding mm_malloc.h Otherwise compiling with 'modern' or 'avx2' architecture on Linux aborts with errors. --- src/misc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/misc.h b/src/misc.h index 5f5aa7e5..e145c4f4 100644 --- a/src/misc.h +++ b/src/misc.h @@ -29,6 +29,7 @@ #include #include #include +#include #include "types.h" #include "thread_win32_osx.h" From 3102896a0017ea8fc79ad12694a9228399aa0dc2 Mon Sep 17 00:00:00 2001 From: zz4032 Date: Tue, 23 Jun 2020 20:53:32 +0200 Subject: [PATCH 2/3] Linux identifier corrected. --- src/misc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/misc.cpp b/src/misc.cpp index 36924d37..25435ac5 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -658,7 +658,7 @@ namespace Dependency { } #endif -#elif defined(_LINUX) +#elif defined(__linux__) // linux環境において、この_LINUXというシンボルはmakefileにて定義されるものとする。 From 5aa801e72188da98c86857ee0f97f85795195ee2 Mon Sep 17 00:00:00 2001 From: zz4032 Date: Tue, 23 Jun 2020 20:54:50 +0200 Subject: [PATCH 3/3] Update misc.h --- src/misc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/misc.h b/src/misc.h index e145c4f4..5f5aa7e5 100644 --- a/src/misc.h +++ b/src/misc.h @@ -29,7 +29,6 @@ #include #include #include -#include #include "types.h" #include "thread_win32_osx.h"