git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 64b build.
[exim.git]
/
src
/
src
/
expand.c
diff --git
a/src/src/expand.c
b/src/src/expand.c
index 9fc00cf41a346384e25433634e4a214a4903d62b..c7dc2742c770f5fbf6687d8f3329d036dc71242c 100644
(file)
--- a/
src/src/expand.c
+++ b/
src/src/expand.c
@@
-3389,12
+3389,12
@@
if (*error == NULL)
* can just let the other invalid results occur otherwise, as they have
* until now. For this one case, we can coerce.
*/
* can just let the other invalid results occur otherwise, as they have
* until now. For this one case, we can coerce.
*/
- if (y == -1 && x ==
LLONG
_MIN && op != '*')
+ if (y == -1 && x ==
EXIM_ARITH
_MIN && op != '*')
{
DEBUG(D_expand)
debug_printf("Integer exception dodging: " PR_EXIM_ARITH "%c-1 coerced to " PR_EXIM_ARITH "\n",
{
DEBUG(D_expand)
debug_printf("Integer exception dodging: " PR_EXIM_ARITH "%c-1 coerced to " PR_EXIM_ARITH "\n",
-
LLONG_MIN, op, LLONG
_MAX);
- x =
LLONG
_MAX;
+
EXIM_ARITH_MIN, op, EXIM_ARITH
_MAX);
+ x =
EXIM_ARITH
_MAX;
continue;
}
if (op == '*')
continue;
}
if (op == '*')
@@
-6514,17
+6514,17
@@
else
default:
break;
case 'k':
default:
break;
case 'k':
- if (value >
LLONG_MAX/1024 || value < LLONG
_MIN/1024) errno = ERANGE;
+ if (value >
EXIM_ARITH_MAX/1024 || value < EXIM_ARITH
_MIN/1024) errno = ERANGE;
else value *= 1024;
endptr++;
break;
case 'm':
else value *= 1024;
endptr++;
break;
case 'm':
- if (value >
LLONG_MAX/(1024*1024) || value < LLONG
_MIN/(1024*1024)) errno = ERANGE;
+ if (value >
EXIM_ARITH_MAX/(1024*1024) || value < EXIM_ARITH
_MIN/(1024*1024)) errno = ERANGE;
else value *= 1024*1024;
endptr++;
break;
case 'g':
else value *= 1024*1024;
endptr++;
break;
case 'g':
- if (value >
LLONG_MAX/(1024*1024*1024) || value < LLONG
_MIN/(1024*1024*1024)) errno = ERANGE;
+ if (value >
EXIM_ARITH_MAX/(1024*1024*1024) || value < EXIM_ARITH
_MIN/(1024*1024*1024)) errno = ERANGE;
else value *= 1024*1024*1024;
endptr++;
break;
else value *= 1024*1024*1024;
endptr++;
break;