Handling merge

diff --combined libmemcached/common.h
index d496cf773e3c759a7b688d97778abba19618e6ac,90c8a140b7e3ef4b41013de55b30093261712ad2..ea2c557498798ba724895df14452da89851daaf1
--- 1/libmemcached/common.h
--- 2/libmemcached/common.h
+++ b/libmemcached/common.h
@@@ -38,6 -38,7 +38,7 @@@
  #include <memcached.h>
  #include "memcached_io.h"
  
+ #include "memcached/protocol_binary.h"
  #include <libmemcached_config.h>
  
  #if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
@@@ -80,6 -81,7 +81,7 @@@ typedef enum 
    MEM_VERIFY_KEY= (1 << 10),
    /* 11 used for weighted ketama */
    MEM_KETAMA_WEIGHTED= (1 << 11),
+   MEM_BINARY_PROTOCOL= (1 << 12),
  } memcached_flags;
  
  /* Hashing algo */
@@@ -100,7 -102,7 +102,7 @@@ void memcached_quit_server(memcached_se
  #define memcached_server_response_decrement(A) (A)->cursor_active--
  #define memcached_server_response_reset(A) (A)->cursor_active=0
  
- memcached_return memcached_do(memcached_server_st *ptr, const char *commmand,
+ memcached_return memcached_do(memcached_server_st *ptr, const void *commmand,
                                size_t command_length, uint8_t with_flush);
  memcached_return memcached_version(memcached_st *ptr);
  memcached_return value_fetch(memcached_server_st *ptr,
@@@ -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__ */