[Python-checkins] cpython (3.2): Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,
georg.brandl
python-checkins at python.org
Sun May 12 12:32:48 CEST 2013
http://hg.python.org/cpython/rev/d5b5116bf953
changeset: 83735:d5b5116bf953
branch: 3.2
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Apr 28 14:10:27 2013 +0300
summary:
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.
files:
Misc/NEWS | 6 ++++++
Modules/_sqlite/cursor.c | 2 +-
Modules/_sqlite/util.c | 8 ++++----
Modules/_sqlite/util.h | 4 ++--
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,6 +19,12 @@
- 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
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -716,7 +716,7 @@
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
--- a/Modules/_sqlite/util.c
+++ b/Modules/_sqlite/util.c
@@ -111,7 +111,7 @@
#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 @@
return PyLong_FromLong(value);
}
-sqlite3_int64
+sqlite_int64
_pysqlite_long_as_int64(PyObject * py_val)
{
int overflow;
@@ -158,8 +158,8 @@
#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
--- a/Modules/_sqlite/util.h
+++ b/Modules/_sqlite/util.h
@@ -36,7 +36,7 @@
*/
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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list