From cd6bf37d06636321ab0f420e445303a4a6c8fd04 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 30 Aug 2018 17:39:44 +0000
Subject: [PATCH] Utilities: explicitly add more includes found by GCC

Utilities/Log.cpp: In member function 'void logs::file_writer::log(logs::level, const char*, std::size_t)':
Utilities/Log.cpp:559:9: error: 'memcpy' is not a member of 'std'
    std::memcpy(pos, text, frag);
         ^~~~~~
Utilities/Log.cpp:559:9: note: suggested alternative: 'empty'
    std::memcpy(pos, text, frag);
         ^~~~~~
         empty
Utilities/Log.cpp:560:9: error: 'memcpy' is not a member of 'std'
    std::memcpy(m_fptr, text + frag, size - frag);
         ^~~~~~
Utilities/Log.cpp:560:9: note: suggested alternative: 'empty'
    std::memcpy(m_fptr, text + frag, size - frag);
         ^~~~~~
         empty
Utilities/Log.cpp:564:9: error: 'memcpy' is not a member of 'std'
    std::memcpy(pos, text, size);
         ^~~~~~
Utilities/Log.cpp:564:9: note: suggested alternative: 'empty'
    std::memcpy(pos, text, size);
         ^~~~~~
         empty
Utilities/sync.h: In member function 'int futex(int*, int, int, const timespec*, int*, int)::futex_map::operator()(int*, int, int, const timespec*, int*, uint)':
Utilities/sync.h:110:20: error: 'find' is not a member of 'std'
     map.erase(std::find(map.find(uaddr), map.end(), ref));
                    ^~~~
Utilities/sync.h:110:20: note: suggested alternative: 'rend'
     map.erase(std::find(map.find(uaddr), map.end(), ref));
                    ^~~~
                    rend
---
 Utilities/Log.cpp | 1 +
 Utilities/sync.h  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Utilities/Log.cpp b/Utilities/Log.cpp
index 97da466863..1202f48488 100644
--- a/Utilities/Log.cpp
+++ b/Utilities/Log.cpp
@@ -6,6 +6,7 @@
 #include "Utilities/sysinfo.h"
 #include "Utilities/Thread.h"
 #include "rpcs3_version.h"
+#include <cstring>
 #include <string>
 #include <unordered_map>
 #include <thread>
diff --git a/Utilities/sync.h b/Utilities/sync.h
index 9c8c6eab95..27cfa70461 100644
--- a/Utilities/sync.h
+++ b/Utilities/sync.h
@@ -17,6 +17,7 @@
 #include <unistd.h>
 #else
 #endif
+#include <algorithm>
 #include <ctime>
 #include <chrono>
 #include <mutex>