Merge

diff --git a/ChangeLog b/ChangeLog
index 5750968b5dd8f7d88e57ee466c3e05ebe7430ad4..6ab3531682e41a03594334535538d1cf5b7841aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
   * New consistent distribution tests.
   * Found a memory leak when a server constantly fails.
+  * Fix in watchpoint macro
   * Changed default timeout to 1 second for poll timeouts
   * Wheel uses less memory/dynamic allocation for size (no longer limited to
     512 hosts by default.

diff --git a/README b/README
index 8ce3eef5e668715b108bc25a9f0cc55f094c6770..3746e3b3a9484ee909ee29631965bc5a868b27cc 100644 (file)
--- a/README
+++ b/README
@@ -1,12 +1,12 @@
 Hi!
 
-So what is this? Its a library in C for connectinng to memcached servers
+So what is this? It is a library in C for connectinng to memcached servers
 (http://danga.com/memcached/). It is also a collection of utilities designed
 to work with memcached.
 
 memcat - Copy the value of a key to standard output
 memflush - Flush the contents of your servers.
-memrm - Remove a key(s) from the serrver.
+memrm - Remove a key(s) from the server.
 memstat - Dump the stats of your servers to standard output
 memslap - Load generation utility (benchmark!)
 

diff --git a/README.FIRST b/README.FIRST
index dd15b737ed1834f5ce349b37e7573227a8bf43d0..389a768df48587e5a65afa4673a369b96a0b68c1 100644 (file)
--- a/README.FIRST
+++ b/README.FIRST
@@ -14,7 +14,7 @@ can do this by running the script:
 ./config/bootstrap
 
 It will set up all of the files you need to build libmemcached. At that
-point it is just the typical "./configure; make; make test; make instal"
+point it is just the typical "./configure; make; make test; make install"
 
 For a tarball release do a "make dist" and for an RPM type "make rpm".
 

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 935a4a1359c909a80782e1959d4b7ae4b6ae4ba3..3a1def4845086c06f57fcc57485762aebbf66fa5 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -183,10 +183,9 @@ memcached_return memcached_delete_by_key(memcached_st *ptr,
                                          time_t expiration);
 
 memcached_return memcached_fetch_execute(memcached_st *ptr, 
-                                             unsigned int (*callback[])(memcached_st *ptr, memcached_result_st *result, void *context),
+                                             memcached_execute_function *callback,
                                              void *context,
-                                             unsigned int number_of_callbacks
-                                             );
+                                             unsigned int number_of_callbacks);
 
 memcached_return memcached_callback_set(memcached_st *ptr, 
                                         memcached_callback flag, 

diff --git a/libmemcached/memcached_fetch_execute.c b/libmemcached/memcached_fetch_execute.c
index 29d76244387ea022ba9f07c21a42a51b51f3b3b8..5058fdecc0dbba7bf17208562e8f7ac5505bdb9a 100644 (file)
--- a/libmemcached/memcached_fetch_execute.c
+++ b/libmemcached/memcached_fetch_execute.c
@@ -3,8 +3,7 @@
 memcached_return memcached_fetch_execute(memcached_st *ptr, 
                                              memcached_execute_function *callback,
                                              void *context,
-                                             unsigned int number_of_callbacks
-                                             )
+                                             unsigned int number_of_callbacks)
 {
   memcached_result_st *result= &ptr->result;
 

diff --git a/libmemcached/memcached_watchpoint.h b/libmemcached/memcached_watchpoint.h
index d61aadfd8335223d403642a75416874f70bcfbe1..10cbdbd804b73c10a1002fd6d6a5bdced5c7d8c6 100644 (file)
--- a/libmemcached/memcached_watchpoint.h
+++ b/libmemcached/memcached_watchpoint.h
@@ -14,8 +14,7 @@ extern "C" {
 #endif
 
 /* Some personal debugging functions */
-#ifdef MEMCACHED_INTERNAL 
-#ifdef HAVE_DEBUG
+#if defined(MEMCACHED_INTERNAL) && defined(HAVE_DEBUG)
 #include <assert.h>
 
 #define WATCHPOINT fprintf(stderr, "\nWATCHPOINT %s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
@@ -36,8 +35,8 @@ extern "C" {
 #define WATCHPOINT_ERRNO(A)
 #define WATCHPOINT_ASSERT_PRINT(A,B,C)
 #define WATCHPOINT_ASSERT(A)
-#endif
-#endif /* MEMCACHED_INTERNAL */
+
+#endif /* MEMCACHED_INTERNAL && HAVE_DEBUG */
 
 #ifdef __cplusplus
 }