diff options
| author | Paolo Bosetti <[email protected]> | 2012-06-01 13:41:10 -0700 |
|---|---|---|
| committer | Paolo Bosetti <[email protected]> | 2012-06-01 13:41:10 -0700 |
| commit | 1bff6a8f62310a750c0943611c70a7247c492bff (patch) | |
| tree | 43123469deb2b59eaad04b81b129dda0c1e16ae2 /include | |
| parent | 8fafbe7e03b089cdbab5334a63f0f01499f394ca (diff) | |
| parent | b2d0f22dee87651bca4e16e287cab61dc303db19 (diff) | |
| download | mruby-1bff6a8f62310a750c0943611c70a7247c492bff.tar.gz mruby-1bff6a8f62310a750c0943611c70a7247c492bff.zip | |
Merge branch 'master' of git://github.com/mruby/mruby into XCode
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/khash.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/mruby/khash.h b/include/mruby/khash.h index 9950dbc80..06c451e44 100644 --- a/include/mruby/khash.h +++ b/include/mruby/khash.h @@ -190,10 +190,9 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; #define kh_size(h) ((h)->size) #define kh_n_buckets(h) ((h)->n_buckets) -//#define kh_int_hash_func(mrb,key) (uint32_t)(key) -#define kh_int_hash_func(mrb,key) (uint32_t)((key)^((key)<<2)^((key)>>2)) +#define kh_int_hash_func(mrb,key) (khint_t)((key)^((key)<<2)^((key)>>2)) #define kh_int_hash_equal(mrb,a, b) (a == b) -#define kh_int64_hash_func(mrb,key) (uint32_t)((key)>>33^(key)^(key)<<11) +#define kh_int64_hash_func(mrb,key) (khint_t)((key)>>33^(key)^(key)<<11) #define kh_int64_hash_equal(mrb,a, b) (a == b) static inline khint_t __ac_X31_hash_string(const char *s) { |