diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2013-04-28 11:10:27 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-04-28 11:10:27 (GMT) |
| commit | a9217a42e62dc8dcf9bb6a184bcf9d5de97d2d9e (patch) | |
| tree | 8e6de9a9bcac65e7e1fa48b2f3abf6455227fa50 | |
| parent | ba2f8be4c6ff755c79d4aeb6805de6bdd0354726 (diff) | |
| download | cpython-a9217a42e62dc8dcf9bb6a184bcf9d5de97d2d9e.zip cpython-a9217a42e62dc8dcf9bb6a184bcf9d5de97d2d9e.tar.gz cpython-a9217a42e62dc8dcf9bb6a184bcf9d5de97d2d9e.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/NEWS | 6 | ||||
| -rw-r--r-- | Modules/_sqlite/cursor.c | 2 | ||||
| -rw-r--r-- | Modules/_sqlite/util.c | 8 | ||||
| -rw-r--r-- | Modules/_sqlite/util.h | 4 |
4 files changed, 13 insertions, 7 deletions
@@ -19,6 +19,12 @@ Library - Issue #15535: Fix namedtuple pickles which were picking up the OrderedDict instead of just the underlying tuple. +Build +----- + +- 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. + Tests ----- diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index fc4b608..30c2206 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -716,7 +716,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 |