From:  <brian@localhost.localdomain>
Date: Tue, 29 Jul 2008 06:01:57 +0000 (-0700)
Subject: Handling merge
X-Git-Tag: _23~20
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=2fe4e1635c70f4b2815aaf9bc147fee0b2c93de3;p=m6w6%2Flibmemcached

Handling merge
---

2fe4e1635c70f4b2815aaf9bc147fee0b2c93de3
diff --cc libmemcached/common.h
index d496cf77,90c8a140..ea2c5574
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@@ -113,7 -115,9 +115,11 @@@ memcached_return memcachd_key_test(cha
  
  memcached_return run_distribution(memcached_st *ptr);
  
 +uint32_t generate_hash_value(const char *key, size_t key_length, memcached_hash hash_algorithm);
 +
  uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length);
+ 
+ extern uint64_t ntohll(uint64_t);
+ extern uint64_t htonll(uint64_t);
+ 
  #endif /* __COMMON_H__ */