merge 3.2

This commit is contained in:
Benjamin Peterson 2012-02-21 11:09:13 -05:00
commit e249dcab7a
5 changed files with 15 additions and 4 deletions

View file

@ -2784,6 +2784,7 @@ generic_hash(unsigned char *data, int len)
register unsigned char *p;
register Py_hash_t x;
assert(_Py_HashSecret_Initialized);
p = (unsigned char *) data;
x = _Py_HashSecret.prefix;
x ^= *p << 7;