projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in changes for ICC fix.
[m6w6/libmemcached]
/
clients
/
memcp.c
diff --git
a/clients/memcp.c
b/clients/memcp.c
index 1dc30631900eed71032fa4424c6201eceed8b9b0..df3ca77e315e46fa205955fcd880c11eee697af3 100644
(file)
--- 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>
#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 */
/* 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;
|| (errno != 0 && val == 0))
{
*error= true;