LOGCXX-500: Merge branch 'master' into LOGCXX-500
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/65ebfef6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/65ebfef6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/65ebfef6 Branch: refs/heads/master Commit: 65ebfef68e009b6811110af3b310d973ac554286 Parents: 9f75f7f e318837 Author: Thorsten Schöning <[email protected]> Authored: Mon Aug 20 08:47:38 2018 +0200 Committer: Thorsten Schöning <[email protected]> Committed: Mon Aug 20 08:47:38 2018 +0200 ---------------------------------------------------------------------- src/main/cpp/mutex.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/65ebfef6/src/main/cpp/mutex.cpp ---------------------------------------------------------------------- diff --cc src/main/cpp/mutex.cpp index 2f3de1a,3ee29dd..2a1f79d mode 100755,100644..100755 --- a/src/main/cpp/mutex.cpp +++ b/src/main/cpp/mutex.cpp @@@ -16,11 -16,10 +16,11 @@@ */ #include <log4cxx/logstring.h> - #include <log4cxx/helpers/mutex.h> #include <log4cxx/helpers/exception.h> + #include <log4cxx/helpers/mutex.h> #include <log4cxx/helpers/pool.h> #include <apr_thread_mutex.h> +#include <apr_thread_rwlock.h> #include <assert.h> #if !defined(LOG4CXX) #define LOG4CXX 1
