From 793c05447469bf282377811e1889593fecea2e19 Mon Sep 17 00:00:00 2001
From: CDAGaming <chrisdoesawesomness@gmail.com>
Date: Tue, 16 Jan 2018 22:28:35 -0600
Subject: [PATCH 1/4] Update inih Submodule and Reorganize Submodules

---
 .gitmodules | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index d5a7ade4fe..90a0fde19b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "inih"]
-    path = externals/inih/inih
-    url = https://github.com/svn2github/inih
 [submodule "boost"]
     path = externals/boost
     url = https://github.com/yuzu-emu/ext-boost.git
@@ -10,15 +7,18 @@
 [submodule "dynarmic"]
     path = externals/dynarmic
     url = https://github.com/MerryMage/dynarmic.git
-[submodule "xbyak"]
-    path = externals/xbyak
-    url = https://github.com/herumi/xbyak.git
 [submodule "fmt"]
     path = externals/fmt
     url = https://github.com/fmtlib/fmt.git
+[submodule "inih"]
+    path = externals/inih/inih
+    url = https://github.com/benhoyt/inih.git
 [submodule "lz4"]
     path = externals/lz4
     url = http://github.com/lz4/lz4.git
 [submodule "unicorn"]
     path = externals/unicorn
-    url = https://github.com/yuzu-emu/unicorn
+    url = https://github.com/yuzu-emu/unicorn.git
+[submodule "xbyak"]
+    path = externals/xbyak
+    url = https://github.com/herumi/xbyak.git

From d776c66f39055c14a1238f00a109921e38ca55f4 Mon Sep 17 00:00:00 2001
From: CDAGaming <chrisdoesawesomness@gmail.com>
Date: Tue, 16 Jan 2018 22:34:08 -0600
Subject: [PATCH 2/4] Upgrade Inih & Apply XCode Update

*Blame Git for not doing this the first Time*
---
 .travis.yml         | 2 +-
 externals/inih/inih | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9edfc08092..196528a3bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
     - os: osx
       env: NAME="macos build"
       sudo: false
-      osx_image: xcode7.3
+      osx_image: xcode9.2
       install: "./.travis/macos/deps.sh"
       script: "./.travis/macos/build.sh"
       after_success: "./.travis/macos/upload.sh"
diff --git a/externals/inih/inih b/externals/inih/inih
index 603729dec8..d709bdac5b 160000
--- a/externals/inih/inih
+++ b/externals/inih/inih
@@ -1 +1 @@
-Subproject commit 603729dec89aaca42d7bd08f08bc333165b7d5d1
+Subproject commit d709bdac5b6bfa27c913d3a3e0e982d2c12217f2

From 4a69ee067f9d813825d2585686c181cb6245f15d Mon Sep 17 00:00:00 2001
From: CDAGaming <cstack2011@yahoo.com>
Date: Wed, 17 Jan 2018 07:28:24 -0600
Subject: [PATCH 3/4] Clang Format Fixes

---
 src/core/hle/kernel/svc.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 088058ebc7..6401af35a6 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -255,9 +255,8 @@ static ResultCode CancelSynchronization(Handle thread_handle) {
 /// Attempts to locks a mutex, creating it if it does not already exist
 static ResultCode LockMutex(Handle holding_thread_handle, VAddr mutex_addr,
                             Handle requesting_thread_handle) {
-    LOG_TRACE(Kernel_SVC,
-              "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, "
-              "requesting_current_thread_handle=0x%08X",
+    LOG_TRACE(Kernel_SVC, "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, "
+                          "requesting_current_thread_handle=0x%08X",
               holding_thread_handle, mutex_addr, requesting_thread_handle);
 
     SharedPtr<Thread> holding_thread = g_handle_table.Get<Thread>(holding_thread_handle);
@@ -547,9 +546,8 @@ static ResultCode CreateThread(Handle* out_handle, VAddr entry_point, u64 arg, V
 
     Core::System::GetInstance().PrepareReschedule();
 
-    LOG_TRACE(Kernel_SVC,
-              "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, "
-              "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X",
+    LOG_TRACE(Kernel_SVC, "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, "
+                          "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X",
               entry_point, name.c_str(), arg, stack_top, priority, processor_id, *out_handle);
 
     return RESULT_SUCCESS;

From 6d18e0dcef9b1cd92ecd139bea38a99dc47d7f17 Mon Sep 17 00:00:00 2001
From: CDAGaming <cstack2011@yahoo.com>
Date: Wed, 17 Jan 2018 07:35:28 -0600
Subject: [PATCH 4/4] Clang Fix

Alphabetical Includes xD
---
 src/core/hle/service/nvdrv/nvdrv.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp
index cf525a875d..6eda64e3eb 100644
--- a/src/core/hle/service/nvdrv/nvdrv.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv.cpp
@@ -7,8 +7,8 @@
 #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
 #include "core/hle/service/nvdrv/devices/nvhost_as_gpu.h"
 #include "core/hle/service/nvdrv/devices/nvmap.h"
-#include "core/hle/service/nvdrv/nvdrv.h"
 #include "core/hle/service/nvdrv/interface.h"
+#include "core/hle/service/nvdrv/nvdrv.h"
 
 namespace Service {
 namespace Nvidia {