Author: jun66j5
Date: Wed Nov 18 00:16:58 2020
New Revision: 1883570
URL: http://svn.apache.org/viewvc?rev=1883570&view=rev
Log:
Fix C4204 errors while building swig-py with Python 3.9 on Windows.
* subversion/bindings/swig/include/svn_global.swg:
Add #pragma to make C4204 a warning instead of an errors from Python.h
in Python 3.9 with Visual Studio.
* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c: Ditto.
Reviewed by: brane
Modified:
subversion/trunk/subversion/bindings/swig/include/svn_global.swg
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Modified: subversion/trunk/subversion/bindings/swig/include/svn_global.swg
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/include/svn_global.swg?rev=1883570&r1=1883569&r2=1883570&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/include/svn_global.swg (original)
+++ subversion/trunk/subversion/bindings/swig/include/svn_global.swg Wed Nov 18
00:16:58 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/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1883570&r1=1883569&r2=1883570&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
(original)
+++
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Wed Nov 18 00:16:58 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>
