Author: carnold
Date: Mon Dec 10 19:09:53 2007
New Revision: 603134
URL: http://svn.apache.org/viewvc?rev=603134&view=rev
Log:
LOGCXX-1: Add explicit LOGCXX definition before using log4cxx_private.h
Modified:
logging/log4cxx/trunk/src/main/cpp/appenderattachableimpl.cpp
logging/log4cxx/trunk/src/main/cpp/appenderskeleton.cpp
logging/log4cxx/trunk/src/main/cpp/aprinitializer.cpp
logging/log4cxx/trunk/src/main/cpp/bytearrayinputstream.cpp
logging/log4cxx/trunk/src/main/cpp/charsetdecoder.cpp
logging/log4cxx/trunk/src/main/cpp/charsetencoder.cpp
logging/log4cxx/trunk/src/main/cpp/class.cpp
logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp
logging/log4cxx/trunk/src/main/cpp/fileinputstream.cpp
logging/log4cxx/trunk/src/main/cpp/fileoutputstream.cpp
logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp
logging/log4cxx/trunk/src/main/cpp/level.cpp
logging/log4cxx/trunk/src/main/cpp/logger.cpp
logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp
logging/log4cxx/trunk/src/main/cpp/loglog.cpp
logging/log4cxx/trunk/src/main/cpp/logmanager.cpp
logging/log4cxx/trunk/src/main/cpp/logstream.cpp
logging/log4cxx/trunk/src/main/cpp/mutex.cpp
logging/log4cxx/trunk/src/main/cpp/objectimpl.cpp
logging/log4cxx/trunk/src/main/cpp/objectptr.cpp
logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp
logging/log4cxx/trunk/src/main/cpp/pool.cpp
logging/log4cxx/trunk/src/main/cpp/propertyresourcebundle.cpp
logging/log4cxx/trunk/src/main/cpp/simpledateformat.cpp
logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp
logging/log4cxx/trunk/src/main/cpp/stringhelper.cpp
logging/log4cxx/trunk/src/main/cpp/stringtokenizer.cpp
logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp
logging/log4cxx/trunk/src/main/cpp/systemerrwriter.cpp
logging/log4cxx/trunk/src/main/cpp/systemoutwriter.cpp
logging/log4cxx/trunk/src/main/cpp/threadspecificdata.cpp
Modified: logging/log4cxx/trunk/src/main/cpp/appenderattachableimpl.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/appenderattachableimpl.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/appenderattachableimpl.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/appenderattachableimpl.cpp Mon Dec 10
19:09:53 2007
@@ -19,7 +19,6 @@
#include <log4cxx/appender.h>
#include <log4cxx/spi/loggingevent.h>
#include <algorithm>
-#include <log4cxx/helpers/aprinitializer.h>
#include <log4cxx/helpers/pool.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/appenderskeleton.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/appenderskeleton.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/appenderskeleton.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/appenderskeleton.cpp Mon Dec 10 19:09:53
2007
@@ -23,7 +23,6 @@
#include <log4cxx/helpers/stringhelper.h>
#include <log4cxx/helpers/synchronized.h>
#include <apr_atomic.h>
-#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/aprinitializer.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/aprinitializer.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/aprinitializer.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/aprinitializer.cpp Mon Dec 10 19:09:53
2007
@@ -15,6 +15,9 @@
* limitations under the License.
*/
#include <log4cxx/logstring.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/helpers/aprinitializer.h>
#include <apr_pools.h>
#include <apr_atomic.h>
Modified: logging/log4cxx/trunk/src/main/cpp/bytearrayinputstream.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/bytearrayinputstream.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/bytearrayinputstream.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/bytearrayinputstream.cpp Mon Dec 10
19:09:53 2007
@@ -20,7 +20,6 @@
#include <log4cxx/helpers/bytebuffer.h>
#include <apr_file_io.h>
#include <log4cxx/helpers/transcoder.h>
-#include <log4cxx/helpers/aprinitializer.h>
#include <algorithm>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/charsetdecoder.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/charsetdecoder.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/charsetdecoder.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/charsetdecoder.cpp Mon Dec 10 19:09:53
2007
@@ -23,6 +23,9 @@
#include <log4cxx/helpers/synchronized.h>
#include <log4cxx/helpers/pool.h>
#include <apr_xlate.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
#include <locale.h>
#include <apr_portable.h>
Modified: logging/log4cxx/trunk/src/main/cpp/charsetencoder.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/charsetencoder.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/charsetencoder.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/charsetencoder.cpp Mon Dec 10 19:09:53
2007
@@ -21,6 +21,9 @@
#include <apr_xlate.h>
#include <log4cxx/helpers/stringhelper.h>
#include <log4cxx/helpers/unicodehelper.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
#include <apr_portable.h>
#include <log4cxx/helpers/mutex.h>
Modified: logging/log4cxx/trunk/src/main/cpp/class.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/class.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/class.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/class.cpp Mon Dec 10 19:09:53 2007
@@ -21,6 +21,9 @@
#include <map>
#include <log4cxx/helpers/stringhelper.h>
#include <log4cxx/log4cxx.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
Modified: logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp Mon Dec 10 19:09:53
2007
@@ -16,9 +16,6 @@
*/
#include <log4cxx/logstring.h>
-#include <log4cxx/private/log4cxx_private.h>
-
-
#include <log4cxx/xml/domconfigurator.h>
#include <log4cxx/appender.h>
#include <log4cxx/layout.h>
Modified: logging/log4cxx/trunk/src/main/cpp/fileinputstream.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/fileinputstream.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/fileinputstream.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/fileinputstream.cpp Mon Dec 10 19:09:53
2007
@@ -21,6 +21,9 @@
#include <log4cxx/helpers/bytebuffer.h>
#include <apr_file_io.h>
#include <log4cxx/helpers/transcoder.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/fileoutputstream.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/fileoutputstream.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/fileoutputstream.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/fileoutputstream.cpp Mon Dec 10 19:09:53
2007
@@ -21,6 +21,9 @@
#include <log4cxx/helpers/bytebuffer.h>
#include <apr_file_io.h>
#include <log4cxx/helpers/transcoder.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp Mon Dec 10 19:09:53 2007
@@ -28,6 +28,9 @@
#include <log4cxx/helpers/synchronized.h>
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/stringhelper.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/helpers/aprinitializer.h>
#include <log4cxx/defaultconfigurator.h>
#include <log4cxx/spi/rootlogger.h>
Modified: logging/log4cxx/trunk/src/main/cpp/level.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/level.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/level.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/level.cpp Mon Dec 10 19:09:53 2007
@@ -19,6 +19,9 @@
#include <log4cxx/level.h>
#include <log4cxx/helpers/stringhelper.h>
#include <log4cxx/helpers/transcoder.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/logger.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/logger.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/logger.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/logger.cpp Mon Dec 10 19:09:53 2007
@@ -29,8 +29,11 @@
#include <log4cxx/helpers/transcoder.h>
#include <log4cxx/helpers/appenderattachableimpl.h>
#include <log4cxx/helpers/exception.h>
-#include <log4cxx/helpers/aprinitializer.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
+#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
Modified: logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp Mon Dec 10 19:09:53 2007
@@ -22,6 +22,9 @@
#include <log4cxx/helpers/loglog.h>
#include <log4cxx/helpers/system.h>
#include <log4cxx/helpers/socket.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/helpers/aprinitializer.h>
#include <log4cxx/helpers/threadspecificdata.h>
#include <log4cxx/helpers/transcoder.h>
Modified: logging/log4cxx/trunk/src/main/cpp/loglog.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/loglog.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/loglog.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/loglog.cpp Mon Dec 10 19:09:53 2007
@@ -19,6 +19,9 @@
#include <log4cxx/helpers/loglog.h>
#include <log4cxx/helpers/transcoder.h>
#include <iostream>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
#include <log4cxx/helpers/synchronized.h>
#include <log4cxx/helpers/aprinitializer.h>
Modified: logging/log4cxx/trunk/src/main/cpp/logmanager.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/logmanager.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/logmanager.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/logmanager.cpp Mon Dec 10 19:09:53 2007
@@ -32,6 +32,9 @@
#include <log4cxx/spi/loggingevent.h>
#include <log4cxx/file.h>
#include <log4cxx/helpers/transcoder.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/logstream.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/logstream.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/logstream.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/logstream.cpp Mon Dec 10 19:09:53 2007
@@ -18,6 +18,9 @@
#include <log4cxx/logstring.h>
#include <log4cxx/stream.h>
#include <log4cxx/helpers/transcoder.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/mutex.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/mutex.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/mutex.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/mutex.cpp Mon Dec 10 19:09:53 2007
@@ -20,6 +20,9 @@
#include <log4cxx/helpers/exception.h>
#include <apr_thread_mutex.h>
#include <assert.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx::helpers;
Modified: logging/log4cxx/trunk/src/main/cpp/objectimpl.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/objectimpl.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/objectimpl.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/objectimpl.cpp Mon Dec 10 19:09:53 2007
@@ -18,6 +18,9 @@
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectimpl.h>
#include <apr_atomic.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx::helpers;
Modified: logging/log4cxx/trunk/src/main/cpp/objectptr.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/objectptr.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/objectptr.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/objectptr.cpp Mon Dec 10 19:09:53 2007
@@ -15,13 +15,8 @@
* limitations under the License.
*/
-#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/exception.h>
-#include <log4cxx/helpers/mutex.h>
-#include <log4cxx/helpers/aprinitializer.h>
-#include <log4cxx/helpers/synchronized.h>
-#include <apr.h>
#include <apr_atomic.h>
using namespace log4cxx::helpers;
Modified: logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp Mon Dec 10 19:09:53
2007
@@ -36,7 +36,6 @@
#include <log4cxx/helpers/transcoder.h>
#include <log4cxx/file.h>
#include <log4cxx/xml/domconfigurator.h>
-#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
Modified: logging/log4cxx/trunk/src/main/cpp/pool.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/pool.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/pool.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/pool.cpp Mon Dec 10 19:09:53 2007
@@ -18,9 +18,12 @@
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/pool.h>
#include <log4cxx/helpers/exception.h>
-#include <log4cxx/helpers/aprinitializer.h>
#include <apr_pools.h>
#include <assert.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
+#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx::helpers;
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/propertyresourcebundle.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/propertyresourcebundle.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/propertyresourcebundle.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/propertyresourcebundle.cpp Mon Dec 10
19:09:53 2007
@@ -17,6 +17,9 @@
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/propertyresourcebundle.h>
#include <log4cxx/helpers/exception.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/simpledateformat.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/simpledateformat.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/simpledateformat.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/simpledateformat.cpp Mon Dec 10 19:09:53
2007
@@ -23,6 +23,9 @@
#include <log4cxx/helpers/transcoder.h>
#include <log4cxx/helpers/stringhelper.h>
#include <assert.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp Mon Dec 10 19:09:53 2007
@@ -14,9 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-#include <log4cxx/private/log4cxx_private.h>
-
#include <log4cxx/net/smtpappender.h>
#include <log4cxx/level.h>
#include <log4cxx/helpers/loglog.h>
@@ -26,6 +23,11 @@
#include <log4cxx/helpers/stringtokenizer.h>
#include <log4cxx/helpers/transcoder.h>
#include <log4cxx/helpers/synchronized.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
+#include <log4cxx/private/log4cxx_private.h>
+
#include <apr_strings.h>
Modified: logging/log4cxx/trunk/src/main/cpp/stringhelper.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/stringhelper.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/stringhelper.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/stringhelper.cpp Mon Dec 10 19:09:53 2007
@@ -23,6 +23,9 @@
#include <vector>
#include <apr_strings.h>
#include <log4cxx/helpers/pool.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
#include <cctype>
Modified: logging/log4cxx/trunk/src/main/cpp/stringtokenizer.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/stringtokenizer.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/stringtokenizer.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/stringtokenizer.cpp Mon Dec 10 19:09:53
2007
@@ -18,6 +18,9 @@
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/stringtokenizer.h>
#include <log4cxx/helpers/exception.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp Mon Dec 10 19:09:53
2007
@@ -22,6 +22,9 @@
#include <log4cxx/spi/loggingevent.h>
#include <log4cxx/level.h>
#include <log4cxx/helpers/transcoder.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
#if LOG4CXX_HAVE_SYSLOG
Modified: logging/log4cxx/trunk/src/main/cpp/systemerrwriter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/systemerrwriter.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/systemerrwriter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/systemerrwriter.cpp Mon Dec 10 19:09:53
2007
@@ -19,6 +19,9 @@
#include <log4cxx/helpers/systemerrwriter.h>
#include <log4cxx/helpers/transcoder.h>
#include <stdio.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/systemoutwriter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/systemoutwriter.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/systemoutwriter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/systemoutwriter.cpp Mon Dec 10 19:09:53
2007
@@ -19,6 +19,9 @@
#include <log4cxx/helpers/systemoutwriter.h>
#include <log4cxx/helpers/transcoder.h>
#include <stdio.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
Modified: logging/log4cxx/trunk/src/main/cpp/threadspecificdata.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/threadspecificdata.cpp?rev=603134&r1=603133&r2=603134&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/threadspecificdata.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/threadspecificdata.cpp Mon Dec 10
19:09:53 2007
@@ -17,8 +17,11 @@
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/threadspecificdata.h>
-#include <log4cxx/helpers/aprinitializer.h>
#include <log4cxx/helpers/exception.h>
+#if !defined(LOG4CXX)
+#define LOG4CXX 1
+#endif
+#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx::helpers;
