diff --git a/src/backend/lib/dshash.c b/src/backend/lib/dshash.c
index b1973d4bfbc..b46f7c4cfd0 100644
--- a/src/backend/lib/dshash.c
+++ b/src/backend/lib/dshash.c
@@ -129,7 +129,7 @@ struct dshash_table
 
 /* How many buckets are there in each partition at a given size? */
 #define BUCKETS_PER_PARTITION(size_log2)		\
-	(UINT64CONST(1) << NUM_SPLITS(size_log2))
+	(((size_t) 1) << NUM_SPLITS(size_log2))
 
 /* Max entries before we need to grow.  Half + quarter = 75% load factor. */
 #define MAX_COUNT_PER_PARTITION(hash_table)				\
diff --git a/src/include/lib/dshash.h b/src/include/lib/dshash.h
index afee6516af5..3f8086e46d6 100644
--- a/src/include/lib/dshash.h
+++ b/src/include/lib/dshash.h
@@ -55,7 +55,7 @@ typedef struct dshash_parameters
 	int			tranche_id;		/* The tranche ID to use for locks */
 } dshash_parameters;
 
-/* Forward declaration of private types for use only by dht.c. */
+/* Forward declaration of private types for use only by dshash.c. */
 struct dshash_table_item;
 typedef struct dshash_table_item dshash_table_item;