Merging Trond, also fixed make test.

[awesomized/libmemcached] / libmemcached / common.h

diff --git a/libmemcached/common.h b/libmemcached/common.h
index c8a1c601e25c0330984aafc5e5e1d55df1f423e7..10b434f133fcf7df7b6d4f497e24b47f61d86f37 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -5,7 +5,7 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
-#include "libmemcached_config.h"
+#include "libmemcached/libmemcached_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,10 +25,10 @@
 #include <netinet/tcp.h>
 
 
-#include <memcached.h>
-#include "memcached_io.h"
+#include "libmemcached/memcached.h"
+#include "libmemcached/memcached_io.h"
 
-#include "memcached/protocol_binary.h"
+#include "libmemcached/memcached/protocol_binary.h"
 
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -97,7 +97,6 @@ memcached_return memcached_connect(memcached_server_st *ptr);
 memcached_return memcached_response(memcached_server_st *ptr,
                                     char *buffer, size_t buffer_length,
                                     memcached_result_st *result);
-uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_length);
 void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death);
 
 #define memcached_server_response_increment(A) (A)->cursor_active++