Author: julianfoad
Date: Thu Oct 18 17:54:51 2012
New Revision: 1399749
URL: http://svn.apache.org/viewvc?rev=1399749&view=rev
Log:
Fix some recent #include path breakage. To access a local include file we
should just give its name. A path relative to the 'subversion' subdirectory
of the source tree only works when building in the source tree.
* subversion/libsvn_ra_serf/util_error.c,
subversion/libsvn_wc/tree_conflict_editor.c
Remove the paths from #includes of local headers.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/util_error.c
subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/util_error.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util_error.c?rev=1399749&r1=1399748&r2=1399749&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util_error.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util_error.c Thu Oct 18 17:54:51
2012
@@ -25,7 +25,7 @@
#include "svn_utf.h"
#include "private/svn_error_private.h"
-#include "libsvn_ra_serf/ra_serf.h"
+#include "ra_serf.h"
/*
* Undefine the helpers for creating errors.
Modified: subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c?rev=1399749&r1=1399748&r2=1399749&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c Thu Oct 18
17:54:51 2012
@@ -43,10 +43,10 @@
#include "private/svn_sqlite.h"
#include "private/svn_wc_private.h"
-#include "libsvn_wc/wc.h"
-#include "libsvn_wc/wc_db.h"
-#include "libsvn_wc/conflicts.h"
-#include "libsvn_wc/workqueue.h"
+#include "wc.h"
+#include "wc_db.h"
+#include "conflicts.h"
+#include "workqueue.h"
/*
* Receiver code.
