From f944af3c91f2fe51336de2616fdce57688955341 Mon Sep 17 00:00:00 2001
From: Mizar <mizar.jp@gmail.com>
Date: Fri, 24 Sep 2021 11:57:40 +0900
Subject: [PATCH] =?UTF-8?q?-=20misc.cpp=20:=20Android=E3=83=93=E3=83=AB?=
 =?UTF-8?q?=E3=83=89=E5=90=91=E3=81=91=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- misc.cpp : Android向けに不足していた定義の追加
see https://github.com/yaneurao/YaneuraOu/commit/fa10bc3ad096c265041fbfe82f7259bcfc5aa680
see https://github.com/official-stockfish/Stockfish/issues/2860
see https://github.com/official-stockfish/Stockfish/pull/2973
see https://github.com/official-stockfish/Stockfish/commit/399cddf444666cf1671c5281f7a8e78887b4f400

- misc.cpp : aligned_large_pages_alloc() の引数の数をWIN32とそれ以外で合わせる
---
 source/misc.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/source/misc.cpp b/source/misc.cpp
index bbd85a9b6..98792a57c 100644
--- a/source/misc.cpp
+++ b/source/misc.cpp
@@ -45,6 +45,11 @@ extern "C" {
 #include <sys/mman.h> // madvise()
 #endif
 
+#if defined(__APPLE__) || defined(__ANDROID__) || defined(__OpenBSD__) || (defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC) && !defined(_WIN32)) || defined(__e2k__)
+#define POSIXALIGNEDALLOC
+#include <stdlib.h>
+#endif
+
 #include "misc.h"
 #include "thread.h"
 #include "usi.h"
@@ -166,7 +171,7 @@ const string engine_info() {
 #undef TOSTRING
 #else
 			ENGINE_NAME
-#endif			
+#endif
 			<< ' '
 			<< EVAL_TYPE_NAME << ' '
 			<< ENGINE_VERSION << std::setfill('0')
@@ -491,7 +496,7 @@ void* aligned_large_pages_alloc(size_t allocSize , size_t align /* ignore */) {
 
 #else
 
-void* aligned_large_pages_alloc(size_t allocSize) {
+void* aligned_large_pages_alloc(size_t allocSize , size_t align /* ignore */) {
 
 #if defined(__linux__)
 	constexpr size_t alignment = 2 * 1024 * 1024; // assumed 2MB page size
@@ -919,7 +924,7 @@ namespace Tools
 			buffer,					// マップ先ワイド文字列を入れるバッファのアドレス
 			length					// バッファのサイズ
 		);
- 
+
 		if (result == 0)
 			return std::wstring(); // 何故かエラーなのだ…。
 
@@ -1505,7 +1510,7 @@ namespace StringExtension
 
 	// 数字に相当する文字か
 	bool is_number(char c) { return '0' <= c && c <= '9'; }
-	
+
 	// 行の末尾の"\r","\n",スペース、"\t"を除去した文字列を返す。
 	std::string trim(const std::string& input)
 	{
@@ -1737,7 +1742,7 @@ namespace Directory {
 	}
 }
 
-#elif defined(__GNUC__) 
+#elif defined(__GNUC__)
 
 #include <direct.h>
 namespace Directory {