Handling merge

[awesomized/libmemcached] / libmemcached / common.h

diff --git a/libmemcached/common.h b/libmemcached/common.h
index d496cf773e3c759a7b688d97778abba19618e6ac..ea2c557498798ba724895df14452da89851daaf1 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -38,6 +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 @@ 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 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death);
 #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,
@@ -116,4 +118,8 @@ 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__ */