Merge ssize_t branch.
diff --git a/Modules/audioop.c b/Modules/audioop.c
index 8d5a305..5e285f4 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -1020,7 +1020,9 @@
 							      cur_i[chan]));
 				if (PyErr_Occurred())
 					goto exit;
-				len = ncp - PyString_AsString(str);
+				/* We have checked before that the length
+				 * of the string fits into int. */
+				len = (int)(ncp - PyString_AsString(str));
 				if (len == 0) {
 					/*don't want to resize to zero length*/
 					rv = PyString_FromStringAndSize("", 0);