From: cgohlke Date: Wed, 15 Jan 2014 05:47:35 +0000 (-0800) Subject: Fix msvc compile error and improve 64 bit compatibility X-Git-Tag: v3.2.1~11^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F973%2Fhead;p=thirdparty%2Ftornado.git Fix msvc compile error and improve 64 bit compatibility --- diff --git a/tornado/speedups.c b/tornado/speedups.c index 8a316c582..174a6129e 100644 --- a/tornado/speedups.c +++ b/tornado/speedups.c @@ -1,21 +1,24 @@ +#define PY_SSIZE_T_CLEAN #include static PyObject* websocket_mask(PyObject* self, PyObject* args) { const char* mask; - int mask_len; + Py_ssize_t mask_len; const char* data; - int data_len; - int i; + Py_ssize_t data_len; + Py_ssize_t i; + PyObject* result; + char* buf; if (!PyArg_ParseTuple(args, "s#s#", &mask, &mask_len, &data, &data_len)) { return NULL; } - PyObject* result = PyBytes_FromStringAndSize(NULL, data_len); + result = PyBytes_FromStringAndSize(NULL, data_len); if (!result) { return NULL; } - char* buf = PyBytes_AsString(result); + buf = PyBytes_AsString(result); for (i = 0; i < data_len; i++) { buf[i] = data[i] ^ mask[i % 4]; }