Fixing increment and decrement to take a 64bit unsigned value.

[awesomized/libmemcached] / include / memcached.h

diff --git a/include/memcached.h b/include/memcached.h
index f9176704231e628373aa2bb40f5964cf6e5197b3..6bf1e0be4efd5cd718939e83265306d14dc91484 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -101,6 +101,11 @@ struct memcached_server_st {
   int fd;
   unsigned int stack_responses;
   unsigned int cursor_active;
+  char write_buffer[MEMCACHED_MAX_BUFFER];
+  size_t write_buffer_offset;
+  char read_buffer[MEMCACHED_MAX_BUFFER];
+  size_t read_buffer_length;
+  char *read_ptr;
   memcached_connection type;
 };
 
@@ -157,11 +162,6 @@ struct memcached_st {
   memcached_server_st *hosts;
   unsigned int number_of_hosts;
   unsigned int cursor_server;
-  char read_buffer[MEMCACHED_MAX_BUFFER];
-  size_t read_buffer_length;
-  char *read_ptr;
-  char write_buffer[MEMCACHED_MAX_BUFFER];
-  size_t write_buffer_offset;
   char connected;
   int cached_errno;
   unsigned long long flags;
@@ -182,11 +182,11 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
 memcached_return memcached_increment(memcached_st *ptr, 
                                      char *key, size_t key_length,
                                      unsigned int offset,
-                                     unsigned int *value);
+                                     uint64_t *value);
 memcached_return memcached_decrement(memcached_st *ptr, 
                                      char *key, size_t key_length,
                                      unsigned int offset,
-                                     unsigned int *value);
+                                     uint64_t *value);
 void memcached_stat_free(memcached_st *, memcached_stat_st *);
 memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error);
 memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args, 
@@ -269,10 +269,14 @@ size_t memcached_result_length(memcached_result_st *ptr);
 #define memcached_result_cas(A) A->cas
 
 
+#ifndef __WATCHPOINT_H__
+#define __WATCHPOINT_H__
 /* Some personal debugging functions */
 #ifdef HAVE_DEBUG
 #define WATCHPOINT fprintf(stderr, "\nWATCHPOINT %s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
+#ifdef __MEMCACHED_H__
 #define WATCHPOINT_ERROR(A) fprintf(stderr, "\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout);
+#endif
 #define WATCHPOINT_STRING(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__,A);fflush(stdout);
 #define WATCHPOINT_NUMBER(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %zu\n", __FILE__, __LINE__,__func__,(size_t)(A));fflush(stdout);
 #define WATCHPOINT_ERRNO(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__, strerror(A));A= 0;fflush(stdout);
@@ -287,13 +291,17 @@ size_t memcached_result_length(memcached_result_st *ptr);
 #define WATCHPOINT_ASSERT(A) { 1; };
 */
 #define WATCHPOINT
+#ifdef __MEMCACHED_H__
 #define WATCHPOINT_ERROR(A)
+#endif
 #define WATCHPOINT_STRING(A)
 #define WATCHPOINT_NUMBER(A)
 #define WATCHPOINT_ERRNO(A)
 #define WATCHPOINT_ASSERT(A)
 #endif
 
+#endif /* __WATCHPOINT_H__ */
+
 
 #ifdef __cplusplus
 }