From: Ezio Melotti Date: Fri, 20 May 2011 12:06:32 +0000 (+0300) Subject: #12072: merge with 3.1. X-Git-Tag: v3.2.1rc2~143 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da5b852c7ccc6486df1e7d36862441448cad37f7;p=thirdparty%2FPython%2Fcpython.git #12072: merge with 3.1. --- da5b852c7ccc6486df1e7d36862441448cad37f7 diff --cc Doc/c-api/buffer.rst index 5a34bc09eef7,37866b7dbdc5..d98ece3e98ef --- a/Doc/c-api/buffer.rst +++ b/Doc/c-api/buffer.rst @@@ -311,10 -313,10 +311,10 @@@ Buffer-related function (*fortran* is ``'A'``). Return 0 otherwise. -.. cfunction:: void PyBuffer_FillContiguousStrides(int ndim, Py_ssize_t *shape, Py_ssize_t *strides, Py_ssize_t itemsize, char fortran) +.. c:function:: void PyBuffer_FillContiguousStrides(int ndim, Py_ssize_t *shape, Py_ssize_t *strides, Py_ssize_t itemsize, char fortran) Fill the *strides* array with byte-strides of a contiguous (C-style if - *fortran* is ``'C'`` or Fortran-style if *fortran* is ``'F'`` array of the + *fortran* is ``'C'`` or Fortran-style if *fortran* is ``'F'``) array of the given shape with the given number of bytes per element.