Author: svn-role
Date: Thu Dec 12 04:00:07 2024
New Revision: 1922447

URL: http://svn.apache.org/viewvc?rev=1922447&view=rev
Log:
Merge r1922418 from trunk:

 * r1922418
   Restore swig-rb to be compatible with Ruby 1.9 through 2.2.
   Justification:
     Fix incompatible with old versions of Ruby in 1.14.5.
   Votes:
     +1: jun66j5, futatuki

Modified:
    subversion/branches/1.14.x/   (props changed)
    subversion/branches/1.14.x/STATUS
    subversion/branches/1.14.x/subversion/bindings/swig/include/svn_types.swg

Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1922418

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1922447&r1=1922446&r2=1922447&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Thu Dec 12 04:00:07 2024
@@ -27,10 +27,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1922418
-   Restore swig-rb to be compatible with Ruby 1.9 through 2.2.
-   Justification:
-     Fix incompatible with old versions of Ruby in 1.14.5.
-   Votes:
-     +1: jun66j5, futatuki

Modified: 
subversion/branches/1.14.x/subversion/bindings/swig/include/svn_types.swg
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/include/svn_types.swg?rev=1922447&r1=1922446&r2=1922447&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/bindings/swig/include/svn_types.swg 
(original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/include/svn_types.swg 
Thu Dec 12 04:00:07 2024
@@ -499,7 +499,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE se
 %typemap(ret) svn_error_t *
 {
   if (TYPE(*svn_presult) == T_ARRAY) {
-    switch (rb_array_len(*svn_presult)) {
+    switch (RARRAY_LEN(*svn_presult)) {
       case 0:
         *svn_presult = Qnil;
         break;


Reply via email to