diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h
index 52f01c6e3c..715f0c3bc4 100644
--- a/src/include/storage/large_object.h
+++ b/src/include/storage/large_object.h
@@ -65,7 +65,7 @@ typedef struct LargeObjectDesc
 /*
  * Maximum byte length for each large object
 */
-#define MAX_LARGE_OBJECT_SIZE	INT64CONST(INT_MAX * LOBLKSIZE)
+#define MAX_LARGE_OBJECT_SIZE	((int64)INT_MAX * LOBLKSIZE)
 
 /*
  * Function definitions...
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index fb17ac8b1e..022cfec093 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -1046,13 +1046,13 @@ static pg_int64
 lo_hton64(pg_int64 host64)
 {
 	pg_int64 	result;
-	uint32_t	h32, l32;
+	uint32	h32, l32;
 
 	/* High order half first, since we're doing MSB-first */
-	h32 = (uint32_t) (host64 >> 32);
+	h32 = (uint32) (host64 >> 32);
 
 	/* Now the low order half */
-	l32 = (uint32_t) (host64 & 0xffffffff);
+	l32 = (uint32) (host64 & 0xffffffff);
 
 	result = htonl(l32);
 	result <<= 32;
@@ -1069,10 +1069,10 @@ static pg_int64
 lo_ntoh64(pg_int64 net64)
 {
 	pg_int64 	result;
-	uint32_t	h32, l32;
+	uint32	h32, l32;
 
-	l32 = (uint32_t) (net64 >> 32);
-	h32 = (uint32_t) (net64 & 0xffffffff);
+	l32 = (uint32) (net64 >> 32);
+	h32 = (uint32) (net64 & 0xffffffff);
 
 	result = ntohl(h32);
 	result <<= 32;