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

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

diff --cc Makefile
Simple merge

diff --cc config.mak.uname
index 281c547e2f6ef617029821a617d518ea5e133915,23eac5ac9dca643220ac345ecd99835928e86e6b..bd55e828cabd2a4b17ebf8a8735027c5c8d950f7
--- 1/config.mak.uname
--- 2/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

diff --cc git-compat-util.h
Simple merge