diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 11:45:45 -0700 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 11:45:45 -0700 |
commit | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (patch) | |
tree | a180a736708834708e0e5b95fd1720f37722b429 /src/citra/citra.cpp | |
parent | 337f1e1b96445b81c40c313b1bf680fe660f14f5 (diff) | |
parent | c956e8a6869d0ee1edd68a6ab880efa6bf1fbe70 (diff) |
Merge pull request #721 from yuriks/more-cleanups
More cleanups
Diffstat (limited to 'src/citra/citra.cpp')
-rw-r--r-- | src/citra/citra.cpp | 4 |
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); |