From bf12f270b3c74f694c789a57cc69f414753ca080 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner
Date: Wed, 6 May 2015 22:59:59 -0300
Subject: Common: Remove many unnecessary cross-platform compatibility macros

---
 src/citra/citra.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/citra')

diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 2c6ced920..634faf76b 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -19,7 +19,7 @@
 #include "citra/emu_window/emu_window_glfw.h"
 
 /// Application entry point
-int __cdecl main(int argc, char **argv) {
+int main(int argc, char **argv) {
     std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger();
     Log::Filter log_filter(Log::Level::Debug);
     Log::SetFilter(&log_filter);
-- 
cgit v1.2.3


From e1fbac3ca13d37d2625c11d30cfdece4327b446b Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner
Date: Wed, 6 May 2015 04:06:12 -0300
Subject: Common: Remove common.h

---
 src/citra/citra.cpp                      | 2 +-
 src/citra/config.cpp                     | 3 +++
 src/citra/emu_window/emu_window_glfw.cpp | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/citra')

diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 634faf76b..1d7e7f270 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -4,7 +4,7 @@
 
 #include <thread>
 
-#include "common/common.h"
+#include "common/logging/log.h"
 #include "common/logging/text_formatter.h"
 #include "common/logging/backend.h"
 #include "common/logging/filter.h"
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 43175d6cb..ab564559d 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -5,7 +5,10 @@
 #include <GLFW/glfw3.h>
 
 #include "citra/default_ini.h"
+
 #include "common/file_util.h"
+#include "common/logging/log.h"
+
 #include "core/settings.h"
 #include "core/core.h"
 
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index f879ee7ca..341b48d2a 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -4,7 +4,7 @@
 
 #include <GLFW/glfw3.h>
 
-#include "common/common.h"
+#include "common/logging/log.h"
 
 #include "video_core/video_core.h"
 
-- 
cgit v1.2.3