From: Dean Rasheed <dean.a.rasheed@gmail.com>
Date: Sat, 20 Feb 2016 15:49:26 +0000 (+0000)
Subject: Further fixing to make pg_size_bytes() portable.
X-Git-Tag: REL9_6_BETA1~667
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=740d71842b8e0e798c80f4f841227b6de81b5f43;p=thirdparty%2Fpostgresql.git

Further fixing to make pg_size_bytes() portable.

Not all compilers support "long long" and the "LL" integer literal
suffix, so use a cast to int64 instead.
---

diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c
index ba84c48cfd7..1db4acf175e 100644
--- a/src/backend/utils/adt/dbsize.c
+++ b/src/backend/utils/adt/dbsize.c
@@ -813,15 +813,15 @@ pg_size_bytes(PG_FUNCTION_ARGS)
 
 		/* Parse the unit case-insensitively */
 		if (pg_strcasecmp(strptr, "bytes") == 0)
-			multiplier = 1;
+			multiplier = (int64) 1;
 		else if (pg_strcasecmp(strptr, "kb") == 0)
-			multiplier = 1024;
+			multiplier = (int64) 1024;
 		else if (pg_strcasecmp(strptr, "mb") == 0)
-			multiplier = 1024 * 1024;
+			multiplier = (int64) 1024 * 1024;
 		else if (pg_strcasecmp(strptr, "gb") == 0)
-			multiplier = 1024 * 1024 * 1024;
+			multiplier = (int64) 1024 * 1024 * 1024;
 		else if (pg_strcasecmp(strptr, "tb") == 0)
-			multiplier = 1024 * 1024 * 1024 * 1024LL;
+			multiplier = (int64) 1024 * 1024 * 1024 * 1024;
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),