summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorTravis E. Oliphant <oliphant@enthought.com>2008-06-06 20:52:38 (GMT)
committerTravis E. Oliphant <oliphant@enthought.com>2008-06-06 20:52:38 (GMT)
commit3900088cb6d70769c7905ea0afa8b6f161186fde (patch)
tree7cb5be0660b0801312b26202635b24f9e977cf73 /Include
parentb2750b5d334e9c8d262009069bce41c15803eca0 (diff)
downloadcpython-3900088cb6d70769c7905ea0afa8b6f161186fde.zip
cpython-3900088cb6d70769c7905ea0afa8b6f161186fde.tar.gz
cpython-3900088cb6d70769c7905ea0afa8b6f161186fde.tar.bz2
Remove locking from buffer protocol as-per discussion.
Diffstat (limited to 'Include')
-rw-r--r--Include/object.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/Include/object.h b/Include/object.h
index 62c4961..e924131 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -163,7 +163,6 @@ typedef void (*releasebufferproc)(PyObject *, Py_buffer *);
#define PyBUF_WRITABLE 0x0001
/* we used to include an E, backwards compatible alias */
#define PyBUF_WRITEABLE PyBUF_WRITABLE
-#define PyBUF_LOCK 0x0002
#define PyBUF_FORMAT 0x0004
#define PyBUF_ND 0x0008
#define PyBUF_STRIDES (0x0010 | PyBUF_ND)
@@ -174,25 +173,15 @@ typedef void (*releasebufferproc)(PyObject *, Py_buffer *);
#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE)
#define PyBUF_CONTIG_RO (PyBUF_ND)
-#define PyBUF_CONTIG_LCK (PyBUF_ND | PyBUF_LOCK)
-#define PyBUF_CONTIG_XLCK (PyBUF_ND | PyBUF_LOCK | PyBUF_WRITABLE)
#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE)
#define PyBUF_STRIDED_RO (PyBUF_STRIDES)
-#define PyBUF_STRIDED_LCK (PyBUF_STRIDES | PyBUF_LOCK)
-#define PyBUF_STRIDED_XLCK (PyBUF_STRIDES | PyBUF_LOCK | PyBUF_WRITABLE)
#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT)
#define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT)
-#define PyBUF_RECORDS_LCK (PyBUF_STRIDES | PyBUF_LOCK | PyBUF_FORMAT)
-#define PyBUF_RECORDS_XLCK (PyBUF_STRIDES | PyBUF_LOCK | PyBUF_WRITABLE \
- | PyBUF_FORMAT)
#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITABLE | PyBUF_FORMAT)
#define PyBUF_FULL_RO (PyBUF_INDIRECT | PyBUF_FORMAT)
-#define PyBUF_FULL_LCK (PyBUF_INDIRECT | PyBUF_LOCK | PyBUF_FORMAT)
-#define PyBUF_FULL_XLCK (PyBUF_INDIRECT | PyBUF_LOCK | PyBUF_WRITABLE \
- | PyBUF_FORMAT)
#define PyBUF_READ 0x100