Author: svn-role Date: Thu Dec 17 04:00:12 2020 New Revision: 1884535 URL: http://svn.apache.org/viewvc?rev=1884535&view=rev Log: Merge r1883570 from trunk:
* r1883570 Fix C4204 errors while building swig-py with Python 3.9 on Windows. Justification: Allow building Python bindings with Python 3.9 on Windows. Votes: +1: jun66j5, jcorvel Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/subversion/bindings/swig/include/svn_global.swg subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Propchange: subversion/branches/1.14.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1883570 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1884535&r1=1884534&r2=1884535&view=diff ============================================================================== --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Thu Dec 17 04:00:12 2020 @@ -103,10 +103,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1883570 - Fix C4204 errors while building swig-py with Python 3.9 on Windows. - Justification: - Allow building Python bindings with Python 3.9 on Windows. - Votes: - +1: jun66j5, jcorvel Modified: subversion/branches/1.14.x/subversion/bindings/swig/include/svn_global.swg URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/include/svn_global.swg?rev=1884535&r1=1884534&r2=1884535&view=diff ============================================================================== --- subversion/branches/1.14.x/subversion/bindings/swig/include/svn_global.swg (original) +++ subversion/branches/1.14.x/subversion/bindings/swig/include/svn_global.swg Thu Dec 17 04:00:12 2020 @@ -34,6 +34,11 @@ #ifdef SWIGPYTHON %begin %{ #define SWIG_PYTHON_STRICT_BYTE_CHAR +#if defined(_MSC_VER) +/* Prevent "non-constant aggregate initializer" errors from Python.h in + * Python 3.9 */ +# pragma warning(default : 4204) +#endif %} #endif Modified: subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1884535&r1=1884534&r2=1884535&view=diff ============================================================================== --- subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (original) +++ subversion/branches/1.14.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Thu Dec 17 04:00:12 2020 @@ -26,6 +26,12 @@ /* Avoid deprecation warnings about PY_SSIZE_T_CLEAN since Python 3.8 */ #define PY_SSIZE_T_CLEAN +#if defined(_MSC_VER) +/* Prevent "non-constant aggregate initializer" errors from Python.h in + * Python 3.9 */ +# pragma warning(default : 4204) +#endif + #include <Python.h>