mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Updated subversion-1.7.xx-svn patch due to recent changes to svn's trunk.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
Index: libsvn_subr/config_file.c
|
||||
Index: subversion/libsvn_subr/config_file.c
|
||||
===================================================================
|
||||
--- subversion-1.7.xx-svn/subversion/libsvn_subr/config_file.c (revision 1002735)
|
||||
--- subversion-1.7.xx-svn/subversion/libsvn_subr/config_file.c (revision 1022152)
|
||||
+++ subversion-1.7.xx-svn/subversion/libsvn_subr/config_file.c (working copy)
|
||||
@@ -38,6 +38,11 @@
|
||||
|
||||
@@ -59,20 +59,19 @@ Index: libsvn_subr/config_file.c
|
||||
const char *homedir = svn_user_get_homedir(pool);
|
||||
if (! homedir)
|
||||
return SVN_NO_ERROR;
|
||||
Index: libsvn_subr/config_impl.h
|
||||
Index: subversion/libsvn_subr/config_impl.h
|
||||
===================================================================
|
||||
--- subversion-1.7.xx-svn/subversion/libsvn_subr/config_impl.h (revision 1002735)
|
||||
--- subversion-1.7.xx-svn/subversion/libsvn_subr/config_impl.h (revision 1022152)
|
||||
+++ subversion-1.7.xx-svn/subversion/libsvn_subr/config_impl.h (working copy)
|
||||
@@ -114,8 +114,11 @@
|
||||
@@ -114,7 +114,10 @@
|
||||
or svn_config_get_user_config_path() instead. */
|
||||
#ifdef WIN32
|
||||
# define SVN_CONFIG__SUBDIRECTORY "Subversion"
|
||||
-#else /* ! WIN32 */
|
||||
+#elif defined __HAIKU__ /* HAIKU */
|
||||
# define SVN_CONFIG__SYS_DIRECTORY "subversion"
|
||||
+# define SVN_CONFIG__SYS_DIRECTORY "subversion"
|
||||
+# define SVN_CONFIG__USR_DIRECTORY "subversion"
|
||||
+#else /* ! WIN32 && ! __HAIKU__ */
|
||||
+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion"
|
||||
# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion"
|
||||
# define SVN_CONFIG__USR_DIRECTORY ".subversion"
|
||||
#endif /* WIN32 */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user