diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-06-04 11:21:40 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-06-04 12:18:50 +0200 |
| commit | b4ee22551c66df0e88e8f22690630d56e72942e6 (patch) | |
| tree | 77ebda0defc1bee30bb3e894d1abd903b43de09e | |
| parent | 2636ca56e509846726b792e8c7a84dbd994af7a4 (diff) | |
fix compile issues
| -rw-r--r-- | package/log4cxx/patches/patch-src_main_cpp_charsetdecoder_cpp | 11 | ||||
| -rw-r--r-- | package/log4cxx/patches/patch-src_main_cpp_charsetencoder_cpp | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/package/log4cxx/patches/patch-src_main_cpp_charsetdecoder_cpp b/package/log4cxx/patches/patch-src_main_cpp_charsetdecoder_cpp new file mode 100644 index 000000000..7242b2b74 --- /dev/null +++ b/package/log4cxx/patches/patch-src_main_cpp_charsetdecoder_cpp @@ -0,0 +1,11 @@ +--- apache-log4cxx-0.10.0.orig/src/main/cpp/charsetdecoder.cpp 2008-04-01 00:34:09.000000000 +0200 ++++ apache-log4cxx-0.10.0/src/main/cpp/charsetdecoder.cpp 2015-05-30 02:51:44.000000000 +0200 +@@ -476,7 +476,7 @@ CharsetDecoderPtr CharsetDecoder::getDec + StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("ISO-LATIN-1"), LOG4CXX_STR("iso-latin-1"))) { + return new ISOLatinCharsetDecoder(); + } +-#if APR_HAS_XLATE || !defined(_WIN32) ++#if APR_HAS_XLATE + return new APRCharsetDecoder(charset); + #else + throw IllegalArgumentException(charset); diff --git a/package/log4cxx/patches/patch-src_main_cpp_charsetencoder_cpp b/package/log4cxx/patches/patch-src_main_cpp_charsetencoder_cpp new file mode 100644 index 000000000..1d9a23c3d --- /dev/null +++ b/package/log4cxx/patches/patch-src_main_cpp_charsetencoder_cpp @@ -0,0 +1,11 @@ +--- apache-log4cxx-0.10.0.orig/src/main/cpp/charsetencoder.cpp 2008-04-01 00:34:09.000000000 +0200 ++++ apache-log4cxx-0.10.0/src/main/cpp/charsetencoder.cpp 2015-05-30 02:42:41.000000000 +0200 +@@ -484,7 +484,7 @@ CharsetEncoderPtr CharsetEncoder::getEnc + } else if (StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("UTF-16LE"), LOG4CXX_STR("utf-16le"))) { + return new UTF16LECharsetEncoder(); + } +-#if APR_HAS_XLATE || !defined(_WIN32) ++#if APR_HAS_XLATE + return new APRCharsetEncoder(charset); + #else + throw IllegalArgumentException(charset); |