Merge branch 'future' into python_api

Former-commit-id: 4162392351
9 years ago · 0730d8bcd3
2 changed files with 2 additions and 2 deletions
--- a/src/utility/initialize.cpp
+++ b/src/utility/initialize.cpp
@ -1,5 +1,6 @@
 #include "initialize.h"

+#include "macros.h"
 #include "src/settings/SettingsManager.h"
 #include "src/settings/modules/DebugSettings.h"

--- a/src/utility/initialize.h
+++ b/src/utility/initialize.h
@ -8,8 +8,7 @@
 #include "log4cplus/loggingmacros.h"
 #include "log4cplus/consoleappender.h"
 #include "log4cplus/fileappender.h"
-extern log4cplus::Logger logger;
-extern log4cplus::Logger printer;
+#include "macros.h"

 #include "src/settings/SettingsManager.h"