From 8a624239703c046d89ebeaf3ea13c87af75b550f Mon Sep 17 00:00:00 2001
From: Rohit Nirmal <rohitnirmal9@gmail.com>
Date: Wed, 3 Dec 2014 12:57:57 -0600
Subject: Change NULLs to nullptrs.

---
 src/common/common_funcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/common/common_funcs.h')

diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index d84ec4c42..1139dc3b8 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -106,7 +106,7 @@ inline u64 _rotr64(u64 x, unsigned int shift){
             // Restore the global locale
             _configthreadlocale(_DISABLE_PER_THREAD_LOCALE);
         }
-        else if(new_locale != NULL)
+        else if(new_locale != nullptr)
         {
             // Configure the thread to set the locale only for this thread
             _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
-- 
cgit v1.2.3


From 27280f178bf2ea94f575849da036d11d23f30d94 Mon Sep 17 00:00:00 2001
From: Tony Wasserka <NeoBrainX@gmail.com>
Date: Thu, 4 Dec 2014 21:57:00 +0100
Subject: Fix some headers to include their dependencies properly.

---
 src/common/common_funcs.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/common/common_funcs.h')

diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 1139dc3b8..3f6df075a 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "common_types.h"
+
 #ifdef _WIN32
 #define SLEEP(x) Sleep(x)
 #else
@@ -73,6 +75,8 @@ inline u64 _rotr64(u64 x, unsigned int shift){
 }
 
 #else // WIN32
+#include <locale.h>
+
 // Function Cross-Compatibility
     #define strcasecmp _stricmp
     #define strncasecmp _strnicmp
-- 
cgit v1.2.3


From 0cd27a511ecd170484b672263c09192b579e31ac Mon Sep 17 00:00:00 2001
From: Tony Wasserka <NeoBrainX@gmail.com>
Date: Thu, 4 Dec 2014 19:41:03 +0100
Subject: Some code cleanup.

---
 src/common/common_funcs.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/common/common_funcs.h')

diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 3f6df075a..db041780a 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -39,6 +39,8 @@ template<> struct CompileTimeAssert<true> {};
 #include <sys/endian.h>
 #endif
 
+#include "common_types.h"
+
 // go to debugger mode
     #ifdef GEKKO
         #define Crash()
-- 
cgit v1.2.3


From 8a681cdf3d4db2fe4ec1257b4c974aa9644ecf43 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sun, 2 Nov 2014 08:58:51 -0200
Subject: Remove redundant include from common_funcs.h

---
 src/common/common_funcs.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/common/common_funcs.h')

diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index db041780a..3f6df075a 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -39,8 +39,6 @@ template<> struct CompileTimeAssert<true> {};
 #include <sys/endian.h>
 #endif
 
-#include "common_types.h"
-
 // go to debugger mode
     #ifdef GEKKO
         #define Crash()
-- 
cgit v1.2.3


From eda30c36eea2ebd772ebef0eba405004607e0134 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Thu, 11 Dec 2014 20:04:08 -0200
Subject: Added missing include in common_funcs.h

---
 src/common/common_funcs.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/common/common_funcs.h')

diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 3f6df075a..67b3679b0 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include "common_types.h"
+#include <cstdlib>
 
 #ifdef _WIN32
 #define SLEEP(x) Sleep(x)
-- 
cgit v1.2.3


From ebfd831ccba32bce097491db3d6bdff0be05935e Mon Sep 17 00:00:00 2001
From: purpasmart96 <kanzoconfigz@hotmail.com>
Date: Tue, 16 Dec 2014 21:38:14 -0800
Subject: License change

---
 src/common/common_funcs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/common/common_funcs.h')

diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 67b3679b0..ca7abbea6 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -1,5 +1,5 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
+// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project
+// Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #pragma once
-- 
cgit v1.2.3