Fix 64 bit XID again and one warning.

stalkerg · stalkerg · commit 1cf715051e90 · 2016-12-20T16:22:08.000+03:00
diff --git a/backup.c b/backup.c
@@ -1619,18 +1619,20 @@ StreamLog(void *arg)
 				starttli);
 
 #if PG_VERSION_NUM >= 90600
-	StreamCtl ctl;
-	ctl.startpos = startpos;
-	ctl.timeline = starttli;
-	ctl.sysidentifier = NULL;
-	ctl.basedir = basedir;
-	ctl.stream_stop = stop_streaming;
-	ctl.standby_message_timeout = standby_message_timeout;
-	ctl.partial_suffix = NULL;
-	ctl.synchronous = false;
-	ctl.mark_done = false;
-	if(ReceiveXlogStream(conn, &ctl) == false)
-		elog(ERROR, "Problem in recivexlog");
+	{
+		StreamCtl ctl;
+		ctl.startpos = startpos;
+		ctl.timeline = starttli;
+		ctl.sysidentifier = NULL;
+		ctl.basedir = basedir;
+		ctl.stream_stop = stop_streaming;
+		ctl.standby_message_timeout = standby_message_timeout;
+		ctl.partial_suffix = NULL;
+		ctl.synchronous = false;
+		ctl.mark_done = false;
+		if(ReceiveXlogStream(conn, &ctl) == false)
+			elog(ERROR, "Problem in recivexlog");
+	}
 #else
 	if(ReceiveXlogStream(conn, startpos, starttli, NULL, basedir,
 					  stop_streaming, standby_message_timeout, NULL,
diff --git a/catalog.c b/catalog.c
@@ -278,7 +278,7 @@ pgBackupWriteResultSection(FILE *out, pgBackup *backup)
 		time2iso(timestamp, lengthof(timestamp), backup->end_time);
 		fprintf(out, "END_TIME='%s'\n", timestamp);
 	}
-	fprintf(out, "RECOVERY_XID=%u\n", backup->recovery_xid);
+	fprintf(out, "RECOVERY_XID=" XID_FMT "\n", backup->recovery_xid);
 	if (backup->recovery_time > 0)
 	{
 		time2iso(timestamp, lengthof(timestamp), backup->recovery_time);

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ pgBackupWriteResultSection(FILE out, pgBackup backup)`
`278`	`278`	`time2iso(timestamp, lengthof(timestamp), backup->end_time);`
`279`	`279`	`fprintf(out, "END_TIME='%s'\n", timestamp);`
`280`	`280`	`}`
`281`		`- fprintf(out, "RECOVERY_XID=%u\n", backup->recovery_xid);`
	`281`	`+ fprintf(out, "RECOVERY_XID=" XID_FMT "\n", backup->recovery_xid);`
`282`	`282`	`if (backup->recovery_time > 0)`
`283`	`283`	`{`
`284`	`284`	`time2iso(timestamp, lengthof(timestamp), backup->recovery_time);`