Commit 40c6b47c authored by Neal Norwitz's avatar Neal Norwitz

Fix errors on 64-bit platforms. Will backport

parent 5f861429
...@@ -209,6 +209,8 @@ Core and builtins ...@@ -209,6 +209,8 @@ Core and builtins
Extension Modules Extension Modules
----------------- -----------------
- Fix 64-bit problems in bsddb.
- Patch #1365916: fix some unsafe 64-bit mmap methods. - Patch #1365916: fix some unsafe 64-bit mmap methods.
- Bug #1290333: Added a workaround for cjkcodecs' _codecs_cn build - Bug #1290333: Added a workaround for cjkcodecs' _codecs_cn build
......
...@@ -1522,7 +1522,7 @@ DB_pget(DBObject* self, PyObject* args, PyObject* kwargs) ...@@ -1522,7 +1522,7 @@ DB_pget(DBObject* self, PyObject* args, PyObject* kwargs)
if (self->primaryDBType == DB_RECNO || if (self->primaryDBType == DB_RECNO ||
self->primaryDBType == DB_QUEUE) self->primaryDBType == DB_QUEUE)
pkeyObj = PyInt_FromLong(*(long *)pkey.data); pkeyObj = PyInt_FromLong(*(int *)pkey.data);
else else
pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size); pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size);
...@@ -1531,7 +1531,7 @@ DB_pget(DBObject* self, PyObject* args, PyObject* kwargs) ...@@ -1531,7 +1531,7 @@ DB_pget(DBObject* self, PyObject* args, PyObject* kwargs)
PyObject *keyObj; PyObject *keyObj;
int type = _DB_get_type(self); int type = _DB_get_type(self);
if (type == DB_RECNO || type == DB_QUEUE) if (type == DB_RECNO || type == DB_QUEUE)
keyObj = PyInt_FromLong(*(long *)key.data); keyObj = PyInt_FromLong(*(int *)key.data);
else else
keyObj = PyString_FromStringAndSize(key.data, key.size); keyObj = PyString_FromStringAndSize(key.data, key.size);
retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj); retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
...@@ -3172,7 +3172,7 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs) ...@@ -3172,7 +3172,7 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
if (self->mydb->primaryDBType == DB_RECNO || if (self->mydb->primaryDBType == DB_RECNO ||
self->mydb->primaryDBType == DB_QUEUE) self->mydb->primaryDBType == DB_QUEUE)
pkeyObj = PyInt_FromLong(*(long *)pkey.data); pkeyObj = PyInt_FromLong(*(int *)pkey.data);
else else
pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size); pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size);
...@@ -3181,7 +3181,7 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs) ...@@ -3181,7 +3181,7 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
PyObject *keyObj; PyObject *keyObj;
int type = _DB_get_type(self->mydb); int type = _DB_get_type(self->mydb);
if (type == DB_RECNO || type == DB_QUEUE) if (type == DB_RECNO || type == DB_QUEUE)
keyObj = PyInt_FromLong(*(long *)key.data); keyObj = PyInt_FromLong(*(int *)key.data);
else else
keyObj = PyString_FromStringAndSize(key.data, key.size); keyObj = PyString_FromStringAndSize(key.data, key.size);
retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj); retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment