aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-11-06 21:32:18 +0200
committerRiccardo Spagni <ric@spagni.net>2018-11-06 21:32:18 +0200
commitfa56a09335381442f6ae9240005fb448af912005 (patch)
tree160c45c5397b196b51914d5f2b24164666db0100 /contrib
parentMerge pull request #4739 (diff)
parenttests: fix MSYS2 warning 'MONERO_DEFAULT_LOG_CATEGORY redefined' (diff)
downloadmonero-fa56a09335381442f6ae9240005fb448af912005.tar.xz
Merge pull request #4740
f067bb0c tests: fix MSYS2 warning 'MONERO_DEFAULT_LOG_CATEGORY redefined' (xiphon)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/epee/include/misc_log_ex.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h
index 530f8e636..9100a8db3 100644
--- a/contrib/epee/include/misc_log_ex.h
+++ b/contrib/epee/include/misc_log_ex.h
@@ -32,7 +32,9 @@
#include "easylogging++.h"
+#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "default"
+
#define MAX_LOG_FILE_SIZE 104850000 // 100 MB - 7600 bytes
#define MAX_LOG_FILES 50