summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-01-04 13:33:00 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-01-04 13:33:00 (GMT)
commitc36625b05df8cf35946a16c1e47faac4d5b5ea00 (patch)
tree8985757b5009c9efd3811450cb714ea51f596015 /Include
parent8fd7b0c1a790158a2ab42f70c6c16636f75a4de8 (diff)
downloadcpython-c36625b05df8cf35946a16c1e47faac4d5b5ea00.zip
cpython-c36625b05df8cf35946a16c1e47faac4d5b5ea00.tar.gz
cpython-c36625b05df8cf35946a16c1e47faac4d5b5ea00.tar.bz2
Some VS 6.0 compatibility fixes from Hirokazu Yamamoto which are also useful for later versions of MSVC. VS6 claims that fortran is a reserved word
Diffstat (limited to 'Include')
-rw-r--r--Include/abstract.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/Include/abstract.h b/Include/abstract.h
index 468afe9..dc21692 100644
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -570,11 +570,11 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
error (i.e. the object does not have a buffer interface or
it is not working).
- If fortran is 'F', then if the object is multi-dimensional,
+ If fort is 'F', then if the object is multi-dimensional,
then the data will be copied into the array in
Fortran-style (first dimension varies the fastest). If
- fortran is 'C', then the data will be copied into the array
- in C-style (last dimension varies the fastest). If fortran
+ fort is 'C', then the data will be copied into the array
+ in C-style (last dimension varies the fastest). If fort
is 'A', then it does not matter and the copy will be made
in whatever way is more efficient.
@@ -585,7 +585,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
/* Copy the data from the src buffer to the buffer of destination
*/
- PyAPI_FUNC(int) PyBuffer_IsContiguous(Py_buffer *view, char fortran);
+ PyAPI_FUNC(int) PyBuffer_IsContiguous(Py_buffer *view, char fort);
PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims,
@@ -595,7 +595,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
char fort);
/* Fill the strides array with byte-strides of a contiguous
- (Fortran-style if fortran is 'F' or C-style otherwise)
+ (Fortran-style if fort is 'F' or C-style otherwise)
array of the given shape with the given number of bytes
per element.
*/