← Back to branch summary

~yeban/libmemcached/todo-host.c

« back to all changes in this revision

Viewing changes to libhashkit/function.c

  • Committer: Brian Aker
  • Date: 2011-02-15 17:26:17 UTC
  • Revision ID: brian@tangent.org-20110215172617-gr7j6dibksxdupwj
https://launchpad.net/bugs/677609
Merge in bug fix for 677609

Show diffs side-by-side

added added

removed removed

Lines of Context:
libhashkit/function.c
41
41
    return HASHKIT_FAILURE;
42
42
#endif
43
43
  case HASHKIT_HASH_MURMUR:
 
44
#ifdef HAVE_MURMUR_HASH
44
45
    self->function= hashkit_murmur;
45
46
    break;    
 
47
#else
 
48
    return HASHKIT_FAILURE;
 
49
#endif
46
50
  case HASHKIT_HASH_JENKINS:
47
51
    self->function= hashkit_jenkins;
48
52
    break;    
126
130
    return HASHKIT_HASH_HSIEH;
127
131
  }
128
132
#endif
 
133
#ifdef HAVE_MURMUR_HASH
129
134
  else if (function == hashkit_murmur)
130
135
  {
131
136
    return HASHKIT_HASH_MURMUR;
132
137
  }
 
138
#endif
133
139
  else if (function == hashkit_jenkins)
134
140
  {
135
141
    return HASHKIT_HASH_JENKINS;