From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Feb 2019 02:18:41 +0000 (-0800)
Subject: Merge branch 'nd/fileno-may-be-macro'
X-Git-Tag: v2.21.0-rc1~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1db999ce8d369dbf20532f1b2ea8cbbcf6f2cc7b

Merge branch 'nd/fileno-may-be-macro'

* nd/fileno-may-be-macro:
git-compat-util: work around fileno(fp) that is a macro
---

1db999ce8d369dbf20532f1b2ea8cbbcf6f2cc7b
diff --cc config.mak.uname
index 281c547e2f,23eac5ac9d..bd55e828ca
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -233,7 -234,7 +234,8 @@@ ifeq ($(uname_S),OpenBSD
  	HAVE_BSD_SYSCTL = YesPlease
  	HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
  	PROCFS_EXECUTABLE_PATH = /proc/curproc/file
 +	FREAD_READS_DIRECTORIES = UnfortunatelyYes
+ 	FILENO_IS_A_MACRO = UnfortunatelyYes
  endif
  ifeq ($(uname_S),MirBSD)
  	NO_STRCASESTR = YesPlease