subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1585499 - in /subversion/branches/1.8.x-apr-0.9: configure.ac subversion/include/private/svn_dep_compat.h subversion/libsvn_subr/prompt.c subversion/tests/libsvn_wc/utils.c
Date Mon, 07 Apr 2014 15:08:18 GMT
Author: philip
Date: Mon Apr  7 15:08:18 2014
New Revision: 1585499

URL: http://svn.apache.org/r1585499
Log:
On 1.8.x-apr-0.9 branch, support for 0.9.x including 0.9.20.

* configure.ac
  (APR_VER_REGEXES): Allow 0.9.2?.
 
* subversion/include/private/svn_dep_compat.h
  (apr_hash_make_custom): Provide.

* subversion/tests/libsvn_wc/utils.c
  Include svn_dep_compat.h.

* subversion/libsvn_subr/prompt.c
  (terminal_open): Use compatibility names.

Modified:
    subversion/branches/1.8.x-apr-0.9/configure.ac
    subversion/branches/1.8.x-apr-0.9/subversion/include/private/svn_dep_compat.h
    subversion/branches/1.8.x-apr-0.9/subversion/libsvn_subr/prompt.c
    subversion/branches/1.8.x-apr-0.9/subversion/tests/libsvn_wc/utils.c

Modified: subversion/branches/1.8.x-apr-0.9/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-apr-0.9/configure.ac?rev=1585499&r1=1585498&r2=1585499&view=diff
==============================================================================
--- subversion/branches/1.8.x-apr-0.9/configure.ac (original)
+++ subversion/branches/1.8.x-apr-0.9/configure.ac Mon Apr  7 15:08:18 2014
@@ -98,7 +98,7 @@ dnl   now generating errors instead of s
 dnl   them.  Only .7 and later can guarantee repository
 dnl   integrity with FSFS.
 
-APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."]
+APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."]
 
 SVN_LIB_APR($APR_VER_REGEXES)
 

Modified: subversion/branches/1.8.x-apr-0.9/subversion/include/private/svn_dep_compat.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-apr-0.9/subversion/include/private/svn_dep_compat.h?rev=1585499&r1=1585498&r2=1585499&view=diff
==============================================================================
--- subversion/branches/1.8.x-apr-0.9/subversion/include/private/svn_dep_compat.h (original)
+++ subversion/branches/1.8.x-apr-0.9/subversion/include/private/svn_dep_compat.h Mon Apr
 7 15:08:18 2014
@@ -78,6 +78,7 @@ void svn_hash__clear(struct apr_hash_t *
 #if !APR_VERSION_AT_LEAST(1,0,0)
 #define APR_UINT64_C(val) UINT64_C(val)
 #define APR_FPROT_OS_DEFAULT APR_OS_DEFAULT
+#define apr_hash_make_custom(pool,hash_func) apr_hash_make(pool)
 #endif
 
 #if !APR_VERSION_AT_LEAST(1,3,0)

Modified: subversion/branches/1.8.x-apr-0.9/subversion/libsvn_subr/prompt.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-apr-0.9/subversion/libsvn_subr/prompt.c?rev=1585499&r1=1585498&r2=1585499&view=diff
==============================================================================
--- subversion/branches/1.8.x-apr-0.9/subversion/libsvn_subr/prompt.c (original)
+++ subversion/branches/1.8.x-apr-0.9/subversion/libsvn_subr/prompt.c Mon Apr  7 15:08:18
2014
@@ -177,7 +177,7 @@ terminal_open(terminal_handle_t **termin
      and stderr for prompting. */
   apr_file_t *tmpfd;
   status = apr_file_open(&tmpfd, "/dev/tty",
-                         APR_FOPEN_READ | APR_FOPEN_WRITE,
+                         APR_READ | APR_WRITE,
                          APR_OS_DEFAULT, pool);
   *terminal = apr_palloc(pool, sizeof(terminal_handle_t));
   if (!status)

Modified: subversion/branches/1.8.x-apr-0.9/subversion/tests/libsvn_wc/utils.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-apr-0.9/subversion/tests/libsvn_wc/utils.c?rev=1585499&r1=1585498&r2=1585499&view=diff
==============================================================================
--- subversion/branches/1.8.x-apr-0.9/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/branches/1.8.x-apr-0.9/subversion/tests/libsvn_wc/utils.c Mon Apr  7 15:08:18
2014
@@ -23,6 +23,7 @@
 #include "svn_error.h"
 #include "svn_client.h"
 #include "svn_pools.h"
+#include "private/svn_dep_compat.h"
 
 #include "utils.h"
 



Mime
View raw message