Issue #14572: Prevent build failures with pre-3.5.0 versions of

sqlite3, such as was shipped with Centos 5 and Mac OS X 10.4.

diff --git a/Misc/NEWS b/Misc/NEWS
index 3a75453acf545b51fa1cf01616218739426a9a83..34c5e47d85e238c4e27ec6a7c898c934cc64b297 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -64,6 +64,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #14572: Prevent build failures with pre-3.5.0 versions of
+  sqlite3, such as was shipped with Centos 5 and Mac OS X 10.4.
+
 - Issue #14426: Correct the Date format in Expires attribute of Set-Cookie
   Header in Cookie.py.
 

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 26678c7a831116a88108ec45f4ccda3ea633838c..a646513c4a1035d86bcba6ba6c9ba174657e14f1 100644 (file)
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -549,7 +549,7 @@ void _pysqlite_set_result(sqlite3_context* context, PyObject* py_val)
     } else if (py_val == Py_None) {
         sqlite3_result_null(context);
     } else if (PyInt_Check(py_val)) {
-        sqlite3_result_int64(context, (sqlite3_int64)PyInt_AsLong(py_val));
+        sqlite3_result_int64(context, (sqlite_int64)PyInt_AsLong(py_val));
     } else if (PyLong_Check(py_val)) {
         sqlite3_result_int64(context, PyLong_AsLongLong(py_val));
     } else if (PyFloat_Check(py_val)) {
@@ -580,7 +580,7 @@ PyObject* _pysqlite_build_py_params(sqlite3_context *context, int argc, sqlite3_
     sqlite3_value* cur_value;
     PyObject* cur_py_value;
     const char* val_str;
-    sqlite3_int64 val_int;
+    sqlite_int64 val_int;
     Py_ssize_t buflen;
     void* raw_buffer;