Author: breser
Date: Thu Apr 2 19:05:44 2015
New Revision: 1670953
URL: http://svn.apache.org/r1670953
Log:
Fix building with apr trunk by removing unnecessary header includes.
apr_thread_mutex.h is included by apr_allocator.h which is included
by apr_pools.h. This header is prone to circular references because
it also includes apr_pools.h and despite efforts to prevent this
it's blowing up clang pretty bad with apr trunk. However, we don't
need it at all because we always have apr_pools.h.
* subversion/include/private/svn_mutex.h,
subversion/libsvn_fs/fs-loader.c,
subversion/libsvn_fs_fs/fs.c,
subversion/libsvn_fs_x/fs.c,
subversion/libsvn_subr/cache-inprocess.c,
subversion/libsvn_subr/dso.c,
subversion/libsvn_subr/pool.c: Remove apr_thread_mutex.h include.
Modified:
subversion/trunk/subversion/include/private/svn_mutex.h
subversion/trunk/subversion/libsvn_fs/fs-loader.c
subversion/trunk/subversion/libsvn_fs_fs/fs.c
subversion/trunk/subversion/libsvn_fs_x/fs.c
subversion/trunk/subversion/libsvn_subr/cache-inprocess.c
subversion/trunk/subversion/libsvn_subr/dso.c
subversion/trunk/subversion/libsvn_subr/pool.c
Modified: subversion/trunk/subversion/include/private/svn_mutex.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_mutex.h?rev=1670953&r1=1670952&r2=1670953&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_mutex.h (original)
+++ subversion/trunk/subversion/include/private/svn_mutex.h Thu Apr 2 19:05:44
2015
@@ -27,8 +27,6 @@
#ifndef SVN_MUTEX_H
#define SVN_MUTEX_H
-#include <apr_thread_mutex.h>
-
#include "svn_error.h"
#ifdef __cplusplus
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1670953&r1=1670952&r2=1670953&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Thu Apr 2 19:05:44 2015
@@ -27,7 +27,6 @@
#include <apr_atomic.h>
#include <apr_hash.h>
#include <apr_md5.h>
-#include <apr_thread_mutex.h>
#include <apr_uuid.h>
#include <apr_strings.h>
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.c?rev=1670953&r1=1670952&r2=1670953&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.c Thu Apr 2 19:05:44 2015
@@ -27,7 +27,6 @@
#include <apr_general.h>
#include <apr_pools.h>
#include <apr_file_io.h>
-#include <apr_thread_mutex.h>
#include "svn_fs.h"
#include "svn_delta.h"
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.c?rev=1670953&r1=1670952&r2=1670953&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.c Thu Apr 2 19:05:44 2015
@@ -27,7 +27,6 @@
#include <apr_general.h>
#include <apr_pools.h>
#include <apr_file_io.h>
-#include <apr_thread_mutex.h>
#include "svn_fs.h"
#include "svn_delta.h"
Modified: subversion/trunk/subversion/libsvn_subr/cache-inprocess.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-inprocess.c?rev=1670953&r1=1670952&r2=1670953&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-inprocess.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-inprocess.c Thu Apr 2
19:05:44 2015
@@ -23,8 +23,6 @@
#include <assert.h>
-#include <apr_thread_mutex.h>
-
#include "svn_pools.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_subr/dso.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dso.c?rev=1670953&r1=1670952&r2=1670953&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/dso.c (original)
+++ subversion/trunk/subversion/libsvn_subr/dso.c Thu Apr 2 19:05:44 2015
@@ -19,7 +19,6 @@
* ====================================================================
*/
-#include <apr_thread_mutex.h>
#include <apr_hash.h>
#include "svn_hash.h"
Modified: subversion/trunk/subversion/libsvn_subr/pool.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/pool.c?rev=1670953&r1=1670952&r2=1670953&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/pool.c (original)
+++ subversion/trunk/subversion/libsvn_subr/pool.c Thu Apr 2 19:05:44 2015
@@ -30,7 +30,6 @@
#include <apr_version.h>
#include <apr_general.h>
#include <apr_pools.h>
-#include <apr_thread_mutex.h>
#include "svn_pools.h"
