[6.0] 29ce1958f Make this compile with modern CLANG

Poul-Henning Kamp phk at FreeBSD.org
Sat Oct 31 09:45:08 UTC 2020


commit 29ce1958f7137db1463378c8079253a86c4090b4
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Oct 31 09:44:12 2020 +0000

    Make this compile with modern CLANG

diff --git a/lib/libvmod_std/vmod_std_conversions.c b/lib/libvmod_std/vmod_std_conversions.c
index a30086106..0bfa0ad7f 100644
--- a/lib/libvmod_std/vmod_std_conversions.c
+++ b/lib/libvmod_std/vmod_std_conversions.c
@@ -71,7 +71,7 @@ vmod_integer(VRT_CTX, VCL_STRING p, VCL_INT i)
 		return (i);
 
 	r = trunc(r);
-	if (r > LONG_MAX || r < LONG_MIN)
+	if (r > (double)LONG_MAX || r < (double)LONG_MIN)
 		return (i);
 
 	return ((VCL_INT)r);
@@ -130,7 +130,7 @@ vmod_real2integer(VRT_CTX, VCL_REAL r, VCL_INT i)
 	if (!isfinite(r))
 		return (i);
 	r = round(r);
-	if (r > LONG_MAX || r < LONG_MIN)
+	if (r > (double)LONG_MAX || r < (double)LONG_MIN)
 		return(i);
 	return ((VCL_INT)r);
 }
@@ -154,7 +154,7 @@ vmod_time2integer(VRT_CTX, VCL_TIME t, VCL_INT i)
 	if (!isfinite(t))
 		return (i);
 	t = round(t);
-	if (t > LONG_MAX || t < LONG_MIN)
+	if (t > (double)LONG_MAX || t < (double)LONG_MIN)
 		return(i);
 	return ((VCL_INT)t);
 }


More information about the varnish-commit mailing list