diff options
| author | Travis E. Oliphant <oliphant@enthought.com> | 2007-10-13 21:03:27 (GMT) |
|---|---|---|
| committer | Travis E. Oliphant <oliphant@enthought.com> | 2007-10-13 21:03:27 (GMT) |
| commit | ddacf968682818a34a90ec6702fbb44098914a9d (patch) | |
| tree | f7f6ccb66009a525c1f8aa176626a8b95a516cef /Include | |
| parent | d417a154e4fcae12fd17b160762eafe8eec6d3f5 (diff) | |
| download | cpython-ddacf968682818a34a90ec6702fbb44098914a9d.zip cpython-ddacf968682818a34a90ec6702fbb44098914a9d.tar.gz cpython-ddacf968682818a34a90ec6702fbb44098914a9d.tar.bz2 | |
Eliminate use of PyBUF_CHARACTER flag which is no longer part of the buffer interface. Fix up array module to export the correct format for wide-builds.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/object.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Include/object.h b/Include/object.h index c9d2217..061fe11 100644 --- a/Include/object.h +++ b/Include/object.h @@ -160,18 +160,17 @@ typedef void (*releasebufferproc)(PyObject *, Py_buffer *); /* Flags for getting buffers */ #define PyBUF_SIMPLE 0 -#define PyBUF_CHARACTER 1 -#define PyBUF_WRITABLE 0x0002 +#define PyBUF_WRITABLE 0x0001 /* we used to include an E, backwards compatible alias */ #define PyBUF_WRITEABLE PyBUF_WRITABLE -#define PyBUF_LOCK 0x0004 -#define PyBUF_FORMAT 0x0008 -#define PyBUF_ND 0x0010 -#define PyBUF_STRIDES (0x0020 | PyBUF_ND) -#define PyBUF_C_CONTIGUOUS (0x0040 | PyBUF_STRIDES) -#define PyBUF_F_CONTIGUOUS (0x0080 | PyBUF_STRIDES) -#define PyBUF_ANY_CONTIGUOUS (0x0100 | PyBUF_STRIDES) -#define PyBUF_INDIRECT (0x0200 | PyBUF_STRIDES) +#define PyBUF_LOCK 0x0002 +#define PyBUF_FORMAT 0x0004 +#define PyBUF_ND 0x0008 +#define PyBUF_STRIDES (0x0010 | PyBUF_ND) +#define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES) +#define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES) +#define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES) +#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES) #define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE) #define PyBUF_CONTIG_RO (PyBUF_ND) |