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. git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1670953 13f79535-47bb-0310-9956-ffa450edef68
apache · Apr 2, 2015 · e5f6165 · e5f6165
1 parent 7691a73
commit e5f6165
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 9 deletions.
diff --git a/subversion/include/private/svn_mutex.h b/subversion/include/private/svn_mutex.h
@@ -27,8 +27,6 @@
 #ifndef SVN_MUTEX_H
 #define SVN_MUTEX_H
 
-#include <apr_thread_mutex.h>
-
 #include "svn_error.h"
 
 #ifdef __cplusplus

diff --git a/subversion/libsvn_fs/fs-loader.c b/subversion/libsvn_fs/fs-loader.c
@@ -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>
 

diff --git a/subversion/libsvn_fs_fs/fs.c b/subversion/libsvn_fs_fs/fs.c
@@ -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"

diff --git a/subversion/libsvn_fs_x/fs.c b/subversion/libsvn_fs_x/fs.c
@@ -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"

diff --git a/subversion/libsvn_subr/cache-inprocess.c b/subversion/libsvn_subr/cache-inprocess.c
@@ -23,8 +23,6 @@
 
 #include <assert.h>
 
-#include <apr_thread_mutex.h>
-
 #include "svn_pools.h"
 
 #include "svn_private_config.h"

diff --git a/subversion/libsvn_subr/dso.c b/subversion/libsvn_subr/dso.c
@@ -19,7 +19,6 @@
  * ====================================================================
  */
 
-#include <apr_thread_mutex.h>
 #include <apr_hash.h>
 
 #include "svn_hash.h"

diff --git a/subversion/libsvn_subr/pool.c b/subversion/libsvn_subr/pool.c
@@ -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"