You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2004/12/11 06:51:06 UTC
cvs commit: logging-log4cxx/include/log4cxx level.h
carnold 2004/12/10 21:51:06
Modified: include/log4cxx level.h
Log:
LOGCXX-10: Conflicting tchar.h: Windows iteration
Revision Changes Path
1.15 +9 -1 logging-log4cxx/include/log4cxx/level.h
Index: level.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/level.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- level.h 11 Dec 2004 05:42:26 -0000 1.14
+++ level.h 11 Dec 2004 05:51:06 -0000 1.15
@@ -21,7 +21,15 @@
#ifndef _LOG4CXX_LEVEL_H
#define _LOG4CXX_LEVEL_H
-
+
+//
+// ERROR may be defined by windows.h and will conflict
+// with the defintion of log4cxx::Level::ERROR below.
+// log4cxx::level::getError() can be used in place of log4cxx::Level::ERROR.
+#if defined(ERROR)
+#error Preprocessor macro ERROR defined (likely by windows.h). Include windows.h later or #undef ERROR.
+#endif
+
namespace log4cxx
{