Author: svn-role Date: Wed Nov 9 04:00:04 2022 New Revision: 1905173 URL: http://svn.apache.org/viewvc?rev=1905173&view=rev Log: Merge r1904167 from trunk:
* r1904167 swig-py: Fix conditionals by SWIG version and by Python version for proxy code. Justification: swig-py should be built correctly with upcoming SWIG 4.1.0 release. Votes: +1: futatuki, jun66j5, jamessan Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg Propchange: subversion/branches/1.14.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1904167 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905173&r1=1905172&r2=1905173&view=diff ============================================================================== --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed Nov 9 04:00:04 2022 @@ -46,11 +46,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1904167 - swig-py: Fix conditionals by SWIG version and by Python version for proxy - code. - Justification: - swig-py should be built correctly with upcoming SWIG 4.1.0 release. - Votes: - +1: futatuki, jun66j5, jamessan Modified: subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg?rev=1905173&r1=1905172&r2=1905173&view=diff ============================================================================== --- subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg (original) +++ subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg Wed Nov 9 04:00:04 2022 @@ -66,7 +66,6 @@ fn() %} -#if defined(SWIGPYTHON_PY3) #if SWIG_VERSION >= 0x040000 %pythoncode %{ # -classic and -modern options have been dropped and this variable @@ -76,7 +75,7 @@ _set_instance_attr = _swig_setattr_nondynamic_instance_variable(object.__setattr__) %} -#else +#elif defined(SWIGPYTHON_PY3) %pythoncode %{ # SWIG classes generated with -modern do not define this variable try: @@ -90,7 +89,6 @@ _set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__) %} -#endif #else %pythoncode %{ # SWIG classes generated with -classic do not define this variable,