[Box Backup-commit] COMMIT r1372 - box/chris/merge/lib/common

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2007-03-05 00:16:29 +0000 (Mon, 05 Mar 2007)
New Revision: 1372

Modified:
   box/chris/merge/lib/common/Logging.h
Log:
Win32 compile fix

(refs #3, merges [1306])


Modified: box/chris/merge/lib/common/Logging.h
===================================================================
--- box/chris/merge/lib/common/Logging.h	2007-03-05 00:14:55 UTC (rev 1371)
+++ box/chris/merge/lib/common/Logging.h	2007-03-05 00:16:29 UTC (rev 1372)
@@ -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
+	};
 }
 
 // --------------------------------------------------------------------------