diff options
| author | Michael Verrilli <msv@pobox.com> | 2015-09-04 11:10:42 -0400 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2015-10-30 12:08:17 -0700 |
| commit | 4cebef5a2bde65027fe448461a7717b81ebb1b4a (patch) | |
| tree | 8595889c4f54a9047e5156734d9964fe3342735c | |
| parent | 017e25f4ecb7e87a201ec0432999a6b8dd9d434c (diff) | |
| download | librabbitmq-4cebef5a2bde65027fe448461a7717b81ebb1b4a.tar.gz | |
64-bit fixes
Most important, must feed PY_SSIZE_T_CLEAN into Python.h for defs to work. Also added a cast to help warn of future changes that might break things.
| -rw-r--r-- | Modules/_librabbitmq/connection.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_librabbitmq/connection.h b/Modules/_librabbitmq/connection.h index 9e452be..a8b3fa9 100644 --- a/Modules/_librabbitmq/connection.h +++ b/Modules/_librabbitmq/connection.h @@ -1,6 +1,7 @@ #ifndef __PYLIBRABBIT_CONNECTION_H__ #define __PYLIBRABBIT_CONNECTION_H__ +#define PY_SSIZE_T_CLEAN #include <Python.h> #include <structmember.h> @@ -11,7 +12,6 @@ # define Py_SIZE(ob) (((PyVarObject*)(ob))->ob_size) #endif #if PY_VERSION_HEX >= 0x02060000 /* 2.6 and up */ -# define PY_SSIZE_T_CLEAN # define PY_SIZE_TYPE Py_ssize_t # define PyLong_FROM_SSIZE_T PyLong_FromSsize_t # define PyLong_AS_SSIZE_T PyLong_AsSsize_t @@ -69,7 +69,7 @@ } while(0) #define PySTRING_FROM_AMQBYTES(member) \ - PyString_FromStringAndSize(member.bytes, member.len); \ + PyString_FromStringAndSize(member.bytes, (PY_SIZE_TYPE)member.len); \ #define AMQTable_TO_PYKEY(table, i) \ PySTRING_FROM_AMQBYTES(table->entries[i].key) |