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 /Objects/object.c | |
| parent | 34b345b8885e5db8ab6627c081ca86a8b78b6989 (diff) | |
| parent | b19fb2462eac776746f6cb40cc84b0587c83b9bc (diff) | |
| download | cpython-git-aee9dfba4a9230f2832dd69d67e92f8e0490a163.tar.gz | |
merge 2.6 with hash randomization fix
Diffstat (limited to 'Objects/object.c')
| -rw-r--r-- | Objects/object.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Objects/object.c b/Objects/object.c index 94a18d37db..93030863d5 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1094,6 +1094,8 @@ PyObject_HashNotImplemented(PyObject *self) return -1; } +_Py_HashSecret_t _Py_HashSecret; + long PyObject_Hash(PyObject *v) { |