Author: stefan2
Date: Mon Jul 29 23:43:31 2013
New Revision: 1508244
URL: http://svn.apache.org/r1508244
Log:
Follow-up to r1508225: don't include svn_private_config.h in
mod_dav_svn as this leads to duplicate package definitions.
* subversion/mod_dav_svn/activity.c,
subversion/mod_dav_svn/deadprops.c,
subversion/mod_dav_svn/lock.c,
subversion/mod_dav_svn/merge.c,
subversion/mod_dav_svn/mod_dav_svn.c,
subversion/mod_dav_svn/reports/update.c,
subversion/mod_dav_svn/repos.c,
subversion/mod_dav_svn/version.c: remove #include svn_private_config.h
Modified:
subversion/trunk/subversion/mod_dav_svn/activity.c
subversion/trunk/subversion/mod_dav_svn/deadprops.c
subversion/trunk/subversion/mod_dav_svn/lock.c
subversion/trunk/subversion/mod_dav_svn/merge.c
subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
subversion/trunk/subversion/mod_dav_svn/reports/update.c
subversion/trunk/subversion/mod_dav_svn/repos.c
subversion/trunk/subversion/mod_dav_svn/version.c
Modified: subversion/trunk/subversion/mod_dav_svn/activity.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/activity.c?rev=1508244&r1=1508243&r2=1508244&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/activity.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/activity.c Mon Jul 29 23:43:31 2013
@@ -28,7 +28,6 @@
#include <httpd.h>
#include <mod_dav.h>
-#include "svn_private_config.h"
#include "svn_hash.h"
#include "svn_checksum.h"
#include "svn_error.h"
Modified: subversion/trunk/subversion/mod_dav_svn/deadprops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/deadprops.c?rev=1508244&r1=1508243&r2=1508244&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/deadprops.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/deadprops.c Mon Jul 29 23:43:31 2013
@@ -28,7 +28,6 @@
#include <httpd.h>
#include <mod_dav.h>
-#include "svn_private_config.h"
#include "svn_hash.h"
#include "svn_xml.h"
#include "svn_pools.h"
Modified: subversion/trunk/subversion/mod_dav_svn/lock.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/lock.c?rev=1508244&r1=1508243&r2=1508244&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/lock.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/lock.c Mon Jul 29 23:43:31 2013
@@ -28,7 +28,6 @@
#include <http_log.h>
#include <mod_dav.h>
-#include "svn_private_config.h"
#include "svn_hash.h"
#include "svn_fs.h"
#include "svn_repos.h"
Modified: subversion/trunk/subversion/mod_dav_svn/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/merge.c?rev=1508244&r1=1508243&r2=1508244&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/merge.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/merge.c Mon Jul 29 23:43:31 2013
@@ -29,7 +29,6 @@
#include <httpd.h>
#include <util_filter.h>
-#include "svn_private_config.h"
#include "svn_hash.h"
#include "svn_pools.h"
#include "svn_fs.h"
Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1508244&r1=1508243&r2=1508244&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Mon Jul 29 23:43:31
2013
@@ -34,7 +34,6 @@
#include <ap_provider.h>
#include <mod_dav.h>
-#include "svn_private_config.h"
#include "svn_hash.h"
#include "svn_version.h"
#include "svn_cache_config.h"
Modified: subversion/trunk/subversion/mod_dav_svn/reports/update.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/update.c?rev=1508244&r1=1508243&r2=1508244&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/update.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/update.c Mon Jul 29
23:43:31 2013
@@ -29,7 +29,6 @@
#include <http_log.h>
#include <mod_dav.h>
-#include "svn_private_config.h"
#include "svn_hash.h"
#include "svn_pools.h"
#include "svn_repos.h"
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1508244&r1=1508243&r2=1508244&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Mon Jul 29 23:43:31 2013
@@ -37,7 +37,6 @@
#define CORE_PRIVATE /* To make ap_show_mpm public in 2.2 */
#include <http_config.h>
-#include "svn_private_config.h"
#include "svn_hash.h"
#include "svn_types.h"
#include "svn_pools.h"
Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1508244&r1=1508243&r2=1508244&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Mon Jul 29 23:43:31 2013
@@ -28,7 +28,6 @@
#include <http_log.h>
#include <mod_dav.h>
-#include "svn_private_config.h"
#include "svn_hash.h"
#include "svn_fs.h"
#include "svn_xml.h"
