Merged from me.

diff --git a/config/autorun.sh b/config/autorun.sh
index d62ca6ba87f7cbc9afe7be5d40a1f55d82778dcb..fdf58deab1caf5e40e91b4f7dbf4b8985bde8393 100755 (executable)
--- a/config/autorun.sh
+++ b/config/autorun.sh
@@ -104,3 +104,9 @@ run $AUTOHEADER || die "Can't execute autoheader"
 # and --force to overwrite them if they already exist
 run $AUTOMAKE $AUTOMAKE_FLAGS  || die "Can't execute automake"
 run $AUTOCONF || die "Can't execute autoconf"
+
+echo -n "Automade with: "
+$AUTOMAKE --version | head -1
+echo -n "Configured with: "
+$AUTOCONF --version | head -1
+

diff --git a/libmemcached/memcached_hash.c b/libmemcached/memcached_hash.c
index 5d73611c7ca9ac47a672afb43a1562c82bc1f8d1..5deb5c755f2708c353756125b31c43ac35b28a8b 100644 (file)
--- a/libmemcached/memcached_hash.c
+++ b/libmemcached/memcached_hash.c
@@ -2,8 +2,8 @@
 
 
 /* Defines */
-static uint64_t FNV_64_INIT= 0xcbf29ce484222325LL;
-static uint64_t FNV_64_PRIME= 0x100000001b3LL;
+static uint64_t FNV_64_INIT= UINT64_C(0xcbf29ce484222325);
+static uint64_t FNV_64_PRIME= UINT64_C(0x100000001b3);
 
 static uint32_t FNV_32_INIT= 2166136261UL;
 static uint32_t FNV_32_PRIME= 16777619;
@@ -143,7 +143,6 @@ static uint32_t dispatch_host(memcached_st *ptr, uint32_t hash)
         right= begin;
       return right->index;
     } 
-    break;
   case MEMCACHED_DISTRIBUTION_MODULA:
     return hash % ptr->number_of_hosts;
   case MEMCACHED_DISTRIBUTION_RANDOM:

diff --git a/libmemcached/memcached_response.c b/libmemcached/memcached_response.c
index 32321c23471b0189fa25fbf6ea37128927cb5259..1ea0c725ea12ca94ad0446ff2d894e1554fd9960 100644 (file)
--- a/libmemcached/memcached_response.c
+++ b/libmemcached/memcached_response.c
@@ -395,13 +395,11 @@ static memcached_return binary_read_one_response(memcached_server_st *ptr,
         WATCHPOINT_ASSERT(bodylen == 0);
         return MEMCACHED_SUCCESS;
       } 
-      break;
     case PROTOCOL_BINARY_CMD_NOOP:
       {
         WATCHPOINT_ASSERT(bodylen == 0);
         return MEMCACHED_END;
       }
-      break;
     case PROTOCOL_BINARY_CMD_STAT:
       {
         if (bodylen == 0)

diff --git a/libmemcached/memcached_storage.c b/libmemcached/memcached_storage.c
index f18b6d8922b47275a59f8cc3e558c488b6063b0f..dd7e23b0ddf2d8d99610b9b04687edefa841d78e 100644 (file)
--- a/libmemcached/memcached_storage.c
+++ b/libmemcached/memcached_storage.c
@@ -37,7 +37,7 @@ static char *storage_op_string(memcached_storage_action verb)
     return "cas ";
   default:
     return "tosserror"; /* This is impossible, fixes issue for compiler warning in VisualStudio */
-  };
+  }
 
   /* NOTREACHED */
 }

diff --git a/libmemcached/memcached_strerror.c b/libmemcached/memcached_strerror.c
index e643db2b7422a2664558411cecd2044703cfcd69..b25bdb362d4b961ce6ed6acfb344ed06edabb7f6 100644 (file)
--- a/libmemcached/memcached_strerror.c
+++ b/libmemcached/memcached_strerror.c
@@ -82,5 +82,5 @@ char *memcached_strerror(memcached_st *ptr __attribute__((unused)), memcached_re
     return "Gibberish returned!";
   default:
     return "Gibberish returned!";
-  };
+  }
 }