mirror of
git://git.savannah.nongnu.org/eliot.git
synced 2025-01-18 10:26:15 +01:00
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
# Chunks 1 and 2 are already in log4cxx SVN, but version 0.10.0 does not contain them
|
|
--- src/main/cpp/inputstreamreader.cpp.orig 2011-01-16 10:11:26.000000000 +0100
|
|
+++ src/main/cpp/inputstreamreader.cpp 2011-01-16 01:12:20.000000000 +0100
|
|
@@ -15,6 +15,7 @@
|
|
* limitations under the License.
|
|
*/
|
|
|
|
+#include <cstring>
|
|
#include <log4cxx/logstring.h>
|
|
#include <log4cxx/helpers/inputstreamreader.h>
|
|
#include <log4cxx/helpers/exception.h>
|
|
--- src/main/cpp/socketoutputstream.cpp.orig 2011-01-16 10:11:20.000000000 +0100
|
|
+++ src/main/cpp/socketoutputstream.cpp 2011-01-16 01:15:07.000000000 +0100
|
|
@@ -15,6 +15,7 @@
|
|
* limitations under the License.
|
|
*/
|
|
|
|
+#include <cstring>
|
|
#include <log4cxx/logstring.h>
|
|
#include <log4cxx/helpers/socketoutputstream.h>
|
|
#include <log4cxx/helpers/socket.h>
|
|
# I should send them this patch
|
|
--- liblog4cxx.pc.in.orig 2011-01-16 20:19:22.000000000 +0100
|
|
+++ liblog4cxx.pc.in 2011-01-16 20:20:00.000000000 +0100
|
|
@@ -22,4 +22,5 @@
|
|
Version: @VERSION@
|
|
Libs: -L${libdir} -llog4cxx
|
|
Cflags: -I${includedir}
|
|
+Requires.private: apr-util-1
|
|
|
|
# Found here: http://www.mail-archive.com/log4cxx-user@logging.apache.org/msg02691.html
|
|
--- src/main/include/log4cxx/helpers/thread.h.orig 2011-01-16 10:09:45.000000000 +0100
|
|
+++ src/main/include/log4cxx/helpers/thread.h 2011-01-16 10:10:01.000000000 +0100
|
|
@@ -22,12 +22,8 @@
|
|
#include <log4cxx/helpers/pool.h>
|
|
|
|
#if !defined(LOG4CXX_THREAD_FUNC)
|
|
-#if defined(_WIN32)
|
|
-#define LOG4CXX_THREAD_FUNC __stdcall
|
|
-#else
|
|
#define LOG4CXX_THREAD_FUNC
|
|
#endif
|
|
-#endif
|
|
|
|
extern "C" {
|
|
typedef struct apr_thread_t apr_thread_t;
|