carnold 2005/05/04 12:17:35
Modified: . build.xml
include/log4cxx log4cxx.h log4cxx.hw
include/log4cxx/private log4cxx.hw
src msxml.cpp
Removed: include/log4cxx/private log4cxx.h
Log:
LOGCXX-43: Configuration, Windows iter, fails test on VC6
Revision Changes Path
1.64 +1 -1 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- build.xml 4 May 2005 16:13:40 -0000 1.63
+++ build.xml 4 May 2005 19:17:35 -0000 1.64
@@ -314,7 +314,7 @@
<delete dir="${build.dir}"/>
<delete>
<fileset dir="${tests.dir}/src" includes="shortsocket*"
excludes="*.cpp"/>
- <fileset dir="${tests.dir}/output"/>
+ <fileset dir="${tests.dir}" includes="output/*"/>
<fileset dir="${include.dir}/log4cxx" includes="**/log4cxx.h"/>
</delete>
</target>
1.2 +16 -1 logging-log4cxx/include/log4cxx/log4cxx.h
Index: log4cxx.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/log4cxx.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4cxx.h 4 May 2005 16:13:40 -0000 1.1
+++ log4cxx.h 4 May 2005 19:17:35 -0000 1.2
@@ -33,10 +33,25 @@
#define LOG4CXX_HAS_WCHAR_T 1
-#define LOG4CXX_EXPORT
+#if defined(_MSC_VER)
+typedef __int64 log4cxx_int64_t;
+#else
typedef long long log4cxx_int64_t;
+#endif
+
typedef log4cxx_int64_t log4cxx_time_t;
typedef int log4cxx_status_t;
+#if defined(LOG4CXX_STATIC)
+#define LOG4CXX_EXPORT
+#else
+#ifdef LOG4CXX
+ #define LOG4CXX_EXPORT __declspec(dllexport)
+#else
+ #define LOG4CXX_EXPORT __declspec(dllimport)
+#endif
#endif
+
+
+#endif
\ No newline at end of file
1.2 +8 -9 logging-log4cxx/include/log4cxx/log4cxx.hw
Index: log4cxx.hw
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/log4cxx.hw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4cxx.hw 4 May 2005 16:13:40 -0000 1.1
+++ log4cxx.hw 4 May 2005 19:17:35 -0000 1.2
@@ -34,12 +34,12 @@
#define LOG4CXX_HAS_WCHAR_T 1
-#if defined(_MSC_VER)
-#if _MSC_VER >= 1200
-typedef __int64 log4cxx_int64_t;
-#else
+#if defined(_MSC_VER)
+typedef __int64 log4cxx_int64_t;
+#else
typedef long long log4cxx_int64_t;
-#endif
+#endif
+
typedef log4cxx_int64_t log4cxx_time_t;
typedef int log4cxx_status_t;
@@ -52,7 +52,6 @@
#define LOG4CXX_EXPORT __declspec(dllimport)
#endif
#endif
-
-
-
-#endif
+
+
+#endif
\ No newline at end of file
1.2 +12 -30 logging-log4cxx/include/log4cxx/private/log4cxx.hw
Index: log4cxx.hw
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/private/log4cxx.hw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4cxx.hw 4 May 2005 16:13:41 -0000 1.1
+++ log4cxx.hw 4 May 2005 19:17:35 -0000 1.2
@@ -14,8 +14,9 @@
*/
-#ifndef LOG4CXX_PRIVATE_H
-#define LOG4CXX_PRIVATE_H
+#ifndef LOG4CXX_PRIVATE_LOG4CXX_H
+#define LOG4CXX_PRIVATE_LOG4CXX_H
+
/* GENERATED FILE WARNING! DO NOT EDIT log4cxx.h
*
@@ -27,14 +28,15 @@
#include <log4cxx/log4cxx.h>
-#if !defined(LOG4CXX)
-#error "log4cxx/private/log4cxx.h should only be used within log4cxx
implementation"
+#if !defined(LOG4CXX) && !defined(LOG4CXX_TEST)
+#error "log4cxx/private/log4cxx.h should only be used within log4cxx and
tests implementation"
#endif
+#define LOG4CXX_HAVE_SYSLOG 0
+
#if defined(_MSC_VER)
-#define HAVE_XML 1
#define LOG4CXX_HAVE_XML 1
#endif
@@ -57,38 +59,18 @@
#if defined(LOG4CXX_STATIC)
#define LOG4CXX_EXPORT
#else
-#if defined(_WIN32)
#ifdef LOG4CXX
#define LOG4CXX_EXPORT __declspec(dllexport)
#else
#define LOG4CXX_EXPORT __declspec(dllimport)
#endif
-#else
-#define LOG4CXX_EXPORT
-#endif
-#endif
-
-#if defined(_MSC_VER)
-#pragma warning(disable : 4250 4251 4786 4290)
-
-
-#if defined(_MSC_VER) && _MSC_VER >= 1200
-typedef __int64 log4cxx_int64_t;
-#else
-typedef long long log4cxx_int64_t;
-#endif
-
-#else
-typedef long long log4cxx_int64_t;
-
-#endif
-
-
-#if defined(_MSC_VER)
-#define LOG4CXX_HAVE_XML 1
#endif
-#define LOG4CXX_HAVE_SYSLOG 0
+#if defined(_WIN64)
+typedef unsigned long long log4cxx_intptr_t;
+#else
+typedef unsigned int log4cxx_intptr_t;
+#endif
#endif
1.16 +2 -1 logging-log4cxx/src/msxml.cpp
Index: msxml.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/msxml.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- msxml.cpp 4 May 2005 16:13:41 -0000 1.15
+++ msxml.cpp 4 May 2005 19:17:35 -0000 1.16
@@ -15,7 +15,8 @@
*/
#define _WIN32_DCOM
-
+
+#include <log4cxx/private/log4cxx.h>
#if LOG4CXX_HAVE_XML
#ifdef _WIN32
