From 387d935a54241540c3d5258fb09bba18f54969ae Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 30 Apr 2016 13:18:21 +0100
Subject: LCD: Remove unneeded #undef with no matching #define.

---
 src/core/hw/lcd.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/core')

diff --git a/src/core/hw/lcd.h b/src/core/hw/lcd.h
index 3dd877fbf..57029c5e8 100644
--- a/src/core/hw/lcd.h
+++ b/src/core/hw/lcd.h
@@ -52,8 +52,6 @@ struct Regs {
         return content[index];
     }
 
-#undef ASSERT_MEMBER_SIZE
-
 };
 static_assert(std::is_standard_layout<Regs>::value, "Structure does not use standard layout");
 
-- 
cgit v1.2.3


From 691a42fe98954c247a8b7e9305a3e9ca5c04d40c Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 30 Apr 2016 16:34:51 +0100
Subject: VideoCore: Run include-what-you-use and fix most includes.

---
 src/core/hle/result.h          | 1 -
 src/core/hle/service/gsp_gpu.h | 1 +
 src/core/settings.h            | 3 ++-
 src/core/tracer/recorder.h     | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/core')

diff --git a/src/core/hle/result.h b/src/core/hle/result.h
index 53931a106..3fc1ab4ee 100644
--- a/src/core/hle/result.h
+++ b/src/core/hle/result.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <new>
-#include <type_traits>
 #include <utility>
 
 #include "common/assert.h"
diff --git a/src/core/hle/service/gsp_gpu.h b/src/core/hle/service/gsp_gpu.h
index 55a993bb8..3b4b678a3 100644
--- a/src/core/hle/service/gsp_gpu.h
+++ b/src/core/hle/service/gsp_gpu.h
@@ -10,6 +10,7 @@
 #include "common/bit_field.h"
 #include "common/common_types.h"
 
+#include "core/hle/result.h"
 #include "core/hle/service/service.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/settings.h b/src/core/settings.h
index 04c0a47f9..ce2a31164 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -6,7 +6,8 @@
 
 #include <string>
 #include <array>
-#include <common/file_util.h>
+
+#include "common/common_types.h"
 
 namespace Settings {
 
diff --git a/src/core/tracer/recorder.h b/src/core/tracer/recorder.h
index a42ccc45f..febf883c8 100644
--- a/src/core/tracer/recorder.h
+++ b/src/core/tracer/recorder.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <string>
 #include <unordered_map>
 #include <vector>
 
-- 
cgit v1.2.3