diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-20 21:44:56 -0500 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-20 21:44:56 -0500 |
| commit | aee9dfba4a9230f2832dd69d67e92f8e0490a163 (patch) | |
| tree | 27a9896969ac7ff79dc75017cff121a077c3eb6e /Include/object.h | |
| parent | 34b345b8885e5db8ab6627c081ca86a8b78b6989 (diff) | |
| parent | b19fb2462eac776746f6cb40cc84b0587c83b9bc (diff) | |
| download | cpython-git-aee9dfba4a9230f2832dd69d67e92f8e0490a163.tar.gz | |
merge 2.6 with hash randomization fix
Diffstat (limited to 'Include/object.h')
| -rw-r--r-- | Include/object.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Include/object.h b/Include/object.h index b3689460ce..c24ea7ffe7 100644 --- a/Include/object.h +++ b/Include/object.h @@ -517,6 +517,12 @@ PyAPI_FUNC(void) Py_ReprLeave(PyObject *); PyAPI_FUNC(long) _Py_HashDouble(double); PyAPI_FUNC(long) _Py_HashPointer(void*); +typedef struct { + long prefix; + long suffix; +} _Py_HashSecret_t; +PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret; + /* Helper for passing objects to printf and the like */ #define PyObject_REPR(obj) PyString_AS_STRING(PyObject_Repr(obj)) |