Use PG-style type defs to make compatible with pre-C99 (windows) compilers

pashkinelfe · pashkinelfe · commit 183f32b69d59 · 2020-11-09T11:54:05.000+04:00
diff --git a/src/rumdatapage.c b/src/rumdatapage.c
@@ -736,7 +736,7 @@ RumDataPageAddItem(Page page, void *data, OffsetNumber offset)
 		if (offset <= maxoff)
 			memmove(ptr + sizeof(PostingItem),
 					ptr,
-				    ((uint16_t)(maxoff - offset + 1)) * sizeof(PostingItem));
+				    ((uint16)(maxoff - offset + 1)) * sizeof(PostingItem));
 	}
 	memcpy(ptr, data, sizeof(PostingItem));
 	RumPageGetOpaque(page)->maxoff++;
@@ -763,7 +763,7 @@ RumPageDeletePostingItem(Page page, OffsetNumber offset)
 		char	   *dstptr = RumDataPageGetItem(page, offset),
 				   *sourceptr = RumDataPageGetItem(page, offset + 1);
 
-		memmove(dstptr, sourceptr, sizeof(PostingItem) * (uint16_t)(maxoff - offset));
+		memmove(dstptr, sourceptr, sizeof(PostingItem) * (uint16)(maxoff - offset));
 	}
 
 	RumPageGetOpaque(page)->maxoff--;
@@ -1246,7 +1246,7 @@ dataSplitPageInternal(RumBtree btree, Buffer lbuf, Buffer rbuf,
 	Assert(!RumPageIsLeaf(newlPage));
 	ptr = vector + (off - 1) * sizeofitem;
 	if (maxoff + 1 - off != 0)
-		memmove(ptr + sizeofitem, ptr, (uint16_t)(maxoff - off + 1) * sizeofitem);
+		memmove(ptr + sizeofitem, ptr, (uint16)(maxoff - off + 1) * sizeofitem);
 	memcpy(ptr, &(btree->pitem), sizeofitem);
 
 	maxoff++;
@@ -1273,7 +1273,7 @@ dataSplitPageInternal(RumBtree btree, Buffer lbuf, Buffer rbuf,
 
 	ptr = RumDataPageGetItem(rPage, FirstOffsetNumber);
 	memcpy(ptr, vector + separator * sizeofitem,
-		   (uint16_t)(maxoff - separator) * sizeofitem);
+		   (uint16)(maxoff - separator) * sizeofitem);
 	RumPageGetOpaque(rPage)->maxoff = maxoff - separator;
 	/* Adjust pd_lower */
 	((PageHeader) rPage)->pd_lower = (ptr +
diff --git a/src/rumget.c b/src/rumget.c
@@ -687,7 +687,7 @@ startScanEntry(RumState * rumstate, RumScanEntry entry, Snapshot snapshot)
 		else if (RumGetNPosting(itup) > 0)
 		{
 			entry->nlist = RumGetNPosting(itup);
-			entry->predictNumberResult = (uint32_t)entry->nlist;
+			entry->predictNumberResult = (uint32)entry->nlist;
 			entry->list = (RumItem *) palloc(sizeof(RumItem) * entry->nlist);
 
 			rumReadTuple(rumstate, entry->attnum, itup, entry->list, true);
@@ -1104,7 +1104,7 @@ entryGetNextItemList(RumState * rumstate, RumScanEntry entry, Snapshot snapshot)
 	else if (RumGetNPosting(itup) > 0)
 	{
 		entry->nlist = RumGetNPosting(itup);
-		entry->predictNumberResult = (uint32_t)entry->nlist;
+		entry->predictNumberResult = (uint32)entry->nlist;
 		entry->list = (RumItem *) palloc(sizeof(RumItem) * entry->nlist);
 
 		rumReadTuple(rumstate, entry->attnum, itup, entry->list, true);
