Merge branch 'threading' of https://github.com/bunnei/citra

Conflicts:
	src/core/hle/function_wrappers.h
	src/core/hle/service/gsp.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/src/common/log_manager.h b/src/common/log_manager.h
index 580860b4d..6d3d7c7ff 100644
--- a/src/common/log_manager.h
+++ b/src/common/log_manager.h
@@ -97,10 +97,10 @@ private:
     ~LogManager();
 public:
 
-    static u32 GetMaxLevel() { return MAX_LOGLEVEL;    }
+    static u32 GetMaxLevel() { return LogTypes::MAX_LOGLEVEL;    }
 
-    void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, 
-             const char *file, int line, const char *fmt, va_list args);
+    void Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, 
+        const char* function, const char *fmt, va_list args);
 
     void SetLogLevel(LogTypes::LOG_TYPE type, LogTypes::LOG_LEVELS level)
     {