Merge.

diff --git a/clients/memcp.c b/clients/memcp.c
index df3ca77e315e46fa205955fcd880c11eee697af3..c748c40a6e11668f25e79dc2061fcd0c2633df9b 100644 (file)
--- a/clients/memcp.c
+++ b/clients/memcp.c
@@ -23,6 +23,10 @@
 #include <errno.h>
 #include <strings.h>
 #include <string.h>
+#include <sys/types.h>
+#include <stdlib.h>
+#include <limits.h>
+
 
 #include <libmemcached/memcached.h>
 
@@ -55,7 +59,7 @@ static long strtol_wrapper(const char *nptr, int base, bool *error)
 
   /* Check for various possible errors */
 
-  if ((errno == ERANGE && (val == INTMAX_MAX || val == INTMAX_MIN))
+  if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
       || (errno != 0 && val == 0))
   {
     *error= true;