From b539fd56a235cfbbdd12ebc64c66686b518573d0 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@gaz>
Date: Mon, 28 Jun 2010 23:39:40 -0700
Subject: [PATCH] Merge in changes for ICC fix.

---
 clients/execute.c   | 8 +++-----
 clients/execute.h   | 3 +++
 clients/generator.c | 2 +-
 clients/memcat.c    | 3 ++-
 clients/memcp.c     | 5 +++--
 clients/memdump.c   | 3 ++-
 clients/memerror.c  | 2 +-
 clients/memflush.c  | 2 +-
 clients/memrm.c     | 2 +-
 clients/memstat.c   | 2 +-
 clients/utilities.c | 2 +-
 clients/utilities.h | 1 +
 12 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/clients/execute.c b/clients/execute.c
index daede9ec..0beaae4b 100644
--- a/clients/execute.c
+++ b/clients/execute.c
@@ -14,8 +14,7 @@
   Return the number of rows set.
 */
 
-#include "libmemcached/common.h"
-
+#include "config.h"
 #include "execute.h"
 
 unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int number_of)
@@ -108,12 +107,11 @@ unsigned int execute_mget(memcached_st *memc,
   rc= memcached_mget_execute(memc, keys, key_length,
                              (size_t)number_of, callbacks, &retrieved, 1);
 
-  likely (rc == MEMCACHED_SUCCESS || rc == MEMCACHED_NOTFOUND ||
+  if (rc == MEMCACHED_SUCCESS || rc == MEMCACHED_NOTFOUND ||
           rc == MEMCACHED_BUFFERED || rc == MEMCACHED_END)
   {
     rc= memcached_fetch_execute(memc, callbacks, (void *)&retrieved, 1);
-    unlikely (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_NOTFOUND &&
-              rc != MEMCACHED_END)
+    if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_NOTFOUND && rc != MEMCACHED_END)
     {
       fprintf(stderr, "Failed to execute mget: %s\n",
               memcached_strerror(memc, rc));
diff --git a/clients/execute.h b/clients/execute.h
index ba54d8d2..176c6fff 100644
--- a/clients/execute.h
+++ b/clients/execute.h
@@ -11,6 +11,9 @@
 
 #ifndef CLIENTS_EXECUTE_H
 #define CLIENTS_EXECUTE_H
+
+#include <stdio.h>
+
 #include "libmemcached/memcached.h"
 #include "generator.h"
 
diff --git a/clients/generator.c b/clients/generator.c
index 6e2f2795..80b398b2 100644
--- a/clients/generator.c
+++ b/clients/generator.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include "libmemcached/common.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/clients/memcat.c b/clients/memcat.c
index d0a6b38f..f50b069d 100644
--- a/clients/memcat.c
+++ b/clients/memcat.c
@@ -9,7 +9,8 @@
  *
  */
 
-#include "libmemcached/common.h"
+#include "config.h"
+
 #include <stdio.h>
 #include <inttypes.h>
 #include <string.h>
diff --git a/clients/memcp.c b/clients/memcp.c
index 1dc30631..df3ca77e 100644
--- a/clients/memcp.c
+++ b/clients/memcp.c
@@ -9,7 +9,8 @@
  *
  */
 
-#include "libmemcached/common.h"
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
@@ -54,7 +55,7 @@ static long strtol_wrapper(const char *nptr, int base, bool *error)
 
   /* Check for various possible errors */
 
-  if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
+  if ((errno == ERANGE && (val == INTMAX_MAX || val == INTMAX_MIN))
       || (errno != 0 && val == 0))
   {
     *error= true;
diff --git a/clients/memdump.c b/clients/memdump.c
index 40ab430a..3654be2b 100644
--- a/clients/memdump.c
+++ b/clients/memdump.c
@@ -9,7 +9,8 @@
  *
  */
 
-#include "libmemcached/common.h"
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
diff --git a/clients/memerror.c b/clients/memerror.c
index 286ef0e1..1ac09118 100644
--- a/clients/memerror.c
+++ b/clients/memerror.c
@@ -8,8 +8,8 @@
  * Summary:
  *
  */
+#include "config.h"
 
-#include "libmemcached/common.h"
 #include <stdio.h>
 #include <inttypes.h>
 #include <string.h>
diff --git a/clients/memflush.c b/clients/memflush.c
index 4cce8cb0..9f2b57c6 100644
--- a/clients/memflush.c
+++ b/clients/memflush.c
@@ -8,8 +8,8 @@
  * Summary:
  *
  */
+#include "config.h"
 
-#include "libmemcached/common.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/clients/memrm.c b/clients/memrm.c
index dfb2c2fb..c5637608 100644
--- a/clients/memrm.c
+++ b/clients/memrm.c
@@ -8,8 +8,8 @@
  * Summary:
  *
  */
+#include "config.h"
 
-#include "libmemcached/common.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
diff --git a/clients/memstat.c b/clients/memstat.c
index db96364e..510cb359 100644
--- a/clients/memstat.c
+++ b/clients/memstat.c
@@ -11,8 +11,8 @@
  *          Brian Aker
  *          Toru Maesaka
  */
+#include "config.h"
 
-#include "libmemcached/common.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/clients/utilities.c b/clients/utilities.c
index 6353ff6b..de2bdf44 100644
--- a/clients/utilities.c
+++ b/clients/utilities.c
@@ -8,8 +8,8 @@
  * Summary:
  *
  */
+#include "config.h"
 
-#include "libmemcached/common.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/clients/utilities.h b/clients/utilities.h
index 162366ab..f7462648 100644
--- a/clients/utilities.h
+++ b/clients/utilities.h
@@ -11,6 +11,7 @@
 
 #include <getopt.h>
 #include <libmemcached/memcached.h>
+#include "libmemcached/watchpoint.h"
 #include "client_options.h"
 
 #if TIME_WITH_SYS_TIME
-- 
2.30.2