summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-04-28 11:10:27 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-04-28 11:10:27 (GMT)
commitd160b12292be2f7eeb824cc4b2b6d1d84dbf8b1a (patch)
treecfff8f0bac81c3676bc4c7ebe74e2a20e5740111
parent4067aa272ee680f1b593bcbba2d227adb1791f2f (diff)
downloadcpython-d160b12292be2f7eeb824cc4b2b6d1d84dbf8b1a.zip
cpython-d160b12292be2f7eeb824cc4b2b6d1d84dbf8b1a.tar.gz
cpython-d160b12292be2f7eeb824cc4b2b6d1d84dbf8b1a.tar.bz2
Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,
such as was shipped with Centos 5 and Mac OS X 10.4.
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/_sqlite/cursor.c2
-rw-r--r--Modules/_sqlite/util.c8
-rw-r--r--Modules/_sqlite/util.h4
4 files changed, 10 insertions, 7 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 5056009..3c9f4a0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.3.2?
Core and Builtins
-----------------
+- Issue #17857: 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 #17413: sys.settrace callbacks were being passed a string instead of an
exception instance for the 'value' element of the arg tuple if the exception
originated from C code; now an exception instance is always provided.
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 1005d88..4999415 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -701,7 +701,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
Py_DECREF(self->lastrowid);
if (!multiple && statement_type == STATEMENT_INSERT) {
- sqlite3_int64 lastrowid;
+ sqlite_int64 lastrowid;
Py_BEGIN_ALLOW_THREADS
lastrowid = sqlite3_last_insert_rowid(self->connection->db);
Py_END_ALLOW_THREADS
diff --git a/Modules/_sqlite/util.c b/Modules/_sqlite/util.c
index a1a462c..d88bc3f 100644
--- a/Modules/_sqlite/util.c
+++ b/Modules/_sqlite/util.c
@@ -111,7 +111,7 @@ int _pysqlite_seterror(sqlite3* db, sqlite3_stmt* st)
#endif
PyObject *
-_pysqlite_long_from_int64(sqlite3_int64 value)
+_pysqlite_long_from_int64(sqlite_int64 value)
{
#ifdef HAVE_LONG_LONG
# if SIZEOF_LONG_LONG < 8
@@ -135,7 +135,7 @@ _pysqlite_long_from_int64(sqlite3_int64 value)
return PyLong_FromLong(value);
}
-sqlite3_int64
+sqlite_int64
_pysqlite_long_as_int64(PyObject * py_val)
{
int overflow;
@@ -158,8 +158,8 @@ _pysqlite_long_as_int64(PyObject * py_val)
#endif
return value;
}
- else if (sizeof(value) < sizeof(sqlite3_int64)) {
- sqlite3_int64 int64val;
+ else if (sizeof(value) < sizeof(sqlite_int64)) {
+ sqlite_int64 int64val;
if (_PyLong_AsByteArray((PyLongObject *)py_val,
(unsigned char *)&int64val, sizeof(int64val),
IS_LITTLE_ENDIAN, 1 /* signed */) >= 0) {
diff --git a/Modules/_sqlite/util.h b/Modules/_sqlite/util.h
index ca02149..88ea906 100644
--- a/Modules/_sqlite/util.h
+++ b/Modules/_sqlite/util.h
@@ -36,7 +36,7 @@ int pysqlite_step(sqlite3_stmt* statement, pysqlite_Connection* connection);
*/
int _pysqlite_seterror(sqlite3* db, sqlite3_stmt* st);
-PyObject * _pysqlite_long_from_int64(sqlite3_int64 value);
-sqlite3_int64 _pysqlite_long_as_int64(PyObject * value);
+PyObject * _pysqlite_long_from_int64(sqlite_int64 value);
+sqlite_int64 _pysqlite_long_as_int64(PyObject * value);
#endif