summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2007-03-05 00:16:29 +0000
committerChris Wilson <chris+github@qwirx.com>2007-03-05 00:16:29 +0000
commit93332d84c85aeec5fb4461325ef1e0af0c55e7c1 (patch)
tree95ad7209fcff2894eea4230567ffee34118ee60e
parentd2852f68a7e7c4f3154ba5d0521c9f9c1c8f535a (diff)
Win32 compile fix
(refs #3, merges [1306])
-rw-r--r--lib/common/Logging.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/common/Logging.h b/lib/common/Logging.h
index 3a7b18b7..04aed1cf 100644
--- a/lib/common/Logging.h
+++ b/lib/common/Logging.h
@@ -42,10 +42,21 @@
#define BOX_TRACE(stuff) BOX_LOG(Log::TRACE, stuff)
#endif
+#undef ERROR
+
namespace Log
{
- enum Level { NOTHING = 1, FATAL, ERROR, WARNING, NOTICE, INFO, TRACE,
- EVERYTHING };
+ enum Level
+ {
+ NOTHING = 1,
+ FATAL,
+ ERROR,
+ WARNING,
+ NOTICE,
+ INFO,
+ TRACE,
+ EVERYTHING
+ };
}
// --------------------------------------------------------------------------