Portability patches from Kevin Dalley for Freebsd 4.0.

[awesomized/libmemcached] / lib / common.h

diff --git a/lib/common.h b/lib/common.h
index 5c2d2682e3a59e01995167f4f322e52b24d847ef..395b80ef83730863c5fbe9d248bdf498fa9a41a6 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -17,11 +17,22 @@
 #include <unistd.h>
 #include <limits.h>
 #include <assert.h>
-#include <time.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/un.h>
 #include <netinet/tcp.h>
+#include "libmemcached_config.h"
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
 
 
 
@@ -40,11 +51,6 @@
 
 #define MEMCACHED_BLOCK_SIZE 1024
 
-typedef enum {
-  MEM_NO_FLUSH,
-  MEM_FLUSH,
-} memcached_flush_action;
-
 typedef enum {
   MEM_NO_BLOCK= (1 << 0),
   MEM_TCP_NODELAY= (1 << 1),
@@ -65,18 +71,20 @@ uint32_t hsieh_hash(char *key, size_t key_length);
 memcached_return memcached_connect(memcached_st *ptr, unsigned int server_key);
 memcached_return memcached_response(memcached_st *ptr, 
                                     char *buffer, size_t buffer_length,
+                                    memcached_result_st *result,
                                     unsigned int server_key);
 unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_length);
-void memcached_quit_server(memcached_st *ptr, unsigned int server_key);
+void memcached_quit_server(memcached_st *ptr, unsigned int server_key, uint8_t io_death);
 
-#define memcached_server_response_increment(A,B) A->hosts[B].stack_responses++
-#define memcached_server_response_decrement(A,B) A->hosts[B].stack_responses--
+#define memcached_server_response_increment(A,B) A->hosts[B].cursor_active++
+#define memcached_server_response_decrement(A,B) A->hosts[B].cursor_active--
+#define memcached_server_response_reset(A,B) A->hosts[B].cursor_active=0
 
 /* String Struct */
-#define memcached_string_length(A) (size_t)(A->end - A->string)
-#define memcached_string_set_length(A, B) A->end= A->string + B
-#define memcached_string_size(A) A->current_size
-#define memcached_string_value(A) A->string
+#define memcached_string_length(A) (size_t)((A)->end - (A)->string)
+#define memcached_string_set_length(A, B) (A)->end= (A)->string + B
+#define memcached_string_size(A) (A)->current_size
+#define memcached_string_value(A) (A)->string
 
 memcached_string_st *memcached_string_create(memcached_st *ptr, 
                                              memcached_string_st *string, 
@@ -93,7 +101,10 @@ void memcached_string_free(memcached_string_st *string);
 memcached_return memcached_do(memcached_st *ptr, unsigned int server_key, char *commmand, 
                               size_t command_length, char with_flush);
 memcached_return memcached_version(memcached_st *ptr);
-
+memcached_return value_fetch(memcached_st *ptr,
+                             char *buffer,
+                             memcached_result_st *result,
+                             unsigned int server_key);
 
 
 #endif /* __COMMON_H__ */