summaryrefslogtreecommitdiffstats
path: root/src/citra/citra.cpp
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-07 20:45:45 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-07 20:45:45 +0200
commit4f4d230dac936f32cceb8be35fe09822d85bb2b6 (patch)
treea180a736708834708e0e5b95fd1720f37722b429 /src/citra/citra.cpp
parentMerge pull request #695 from Subv/crash_f (diff)
parentFix printf format warning (diff)
downloadyuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar
yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.gz
yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.bz2
yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.lz
yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.xz
yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.zst
yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.zip
Diffstat (limited to '')
-rw-r--r--src/citra/citra.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 2c6ced920..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"
@@ -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);