Merge pull request #20004 from yuwata/readdir-ensure-type

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Thu, 24 Jun 2021 13:11:06 +0000 (15:11 +0200)

committer GitHub <noreply@github.com>

Thu, 24 Jun 2021 13:11:06 +0000 (15:11 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 24 Jun 2021 13:11:06 +0000 (15:11 +0200)
committer GitHub <noreply@github.com>
Thu, 24 Jun 2021 13:11:06 +0000 (15:11 +0200)
diff --cc src/basic/fs-util.c
Simple merge
diff --cc src/portable/portable.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 24 Jun 2021 13:11:06 +0000 (15:11 +0200)
committer	GitHub <noreply@github.com>
	Thu, 24 Jun 2021 13:11:06 +0000 (15:11 +0200)
		1	2
src/basic/fs-util.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/portable/portable.c	patch \|	diff1 \|	diff2 \|	blob \| history