diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-15 15:59:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-15 15:59:10 -0500 |
| commit | 35423d397f9d4f7810e538b608ded47c33311026 (patch) | |
| tree | 61acc3efaad82b92b1752568a03a296738bf03fb /src/ext/ht.h | |
| parent | b3a69074933492080629d45b1c890606aa2bd08a (diff) | |
| parent | 1ad6dd0dbee7c757ef5f2f2d38b846ab7d991fb2 (diff) | |
| download | tor-35423d397f9d4f7810e538b608ded47c33311026.tar.gz tor-35423d397f9d4f7810e538b608ded47c33311026.zip | |
Merge branch 'bug4900_siphash_v2'
Diffstat (limited to 'src/ext/ht.h')
| -rw-r--r-- | src/ext/ht.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ext/ht.h b/src/ext/ht.h index 62c458ad0e..e76b4aa4d9 100644 --- a/src/ext/ht.h +++ b/src/ext/ht.h @@ -86,6 +86,7 @@ ht_string_hash(const char *s) } #endif +#if 0 /** Basic string hash function, from Python's str.__hash__() */ static INLINE unsigned ht_string_hash(const char *s) @@ -100,6 +101,7 @@ ht_string_hash(const char *s) h ^= (unsigned)(cp-(const unsigned char*)s); return h; } +#endif #ifndef HT_NO_CACHE_HASH_VALUES #define HT_SET_HASH_(elm, field, hashfn) \ |