Merge branch 'master' into stable

za-arthur · za-arthur · commit 04402d288e27 · 2017-10-11T16:43:43.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -237,12 +237,12 @@ ReceiveFileList(parray* files, PGconn *conn, PGresult *res, int rownum)
 			if (copybuf[156] == '5')
 			{
 				/* Directory */
-				pgfile->mode |= __S_IFDIR;
+				pgfile->mode |= S_IFDIR;
 			}
 			else if (copybuf[156] == '2')
 			{
 				/* Symlink */
-				pgfile->mode |= __S_IFLNK;
+				pgfile->mode |= S_IFLNK;
 			}
 			else
 				elog(ERROR, "Unrecognized link indicator \"%c\"\n",
@@ -251,7 +251,7 @@ ReceiveFileList(parray* files, PGconn *conn, PGresult *res, int rownum)
 		else
 		{
 			/* regular file */
-			pgfile->mode |= __S_IFREG;
+			pgfile->mode |= S_IFREG;
 		}
 
 		parray_append(files, pgfile);

Original file line number	Diff line number	Diff line change
`@@ -237,12 +237,12 @@ ReceiveFileList(parray* files, PGconn conn, PGresult res, int rownum)`
`237`	`237`	`if (copybuf[156] == '5')`
`238`	`238`	`{`
`239`	`239`	`/* Directory */`
`240`		`- pgfile->mode \|= __S_IFDIR;`
	`240`	`+ pgfile->mode \|= S_IFDIR;`
`241`	`241`	`}`
`242`	`242`	`else if (copybuf[156] == '2')`
`243`	`243`	`{`
`244`	`244`	`/* Symlink */`
`245`		`- pgfile->mode \|= __S_IFLNK;`
	`245`	`+ pgfile->mode \|= S_IFLNK;`
`246`	`246`	`}`
`247`	`247`	`else`
`248`	`248`	`elog(ERROR, "Unrecognized link indicator \"%c\"\n",`
`@@ -251,7 +251,7 @@ ReceiveFileList(parray* files, PGconn conn, PGresult res, int rownum)`
`251`	`251`	`else`
`252`	`252`	`{`
`253`	`253`	`/* regular file */`
`254`		`- pgfile->mode \|= __S_IFREG;`
	`254`	`+ pgfile->mode \|= S_IFREG;`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`parray_append(files, pgfile);`