Merge branch 'nd/fileno-may-be-macro'
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 02:18:41 +0000 (18:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 02:18:41 +0000 (18:18 -0800)
* nd/fileno-may-be-macro:
  git-compat-util: work around fileno(fp) that is a macro

1  2 
Makefile
config.mak.uname
git-compat-util.h

diff --cc Makefile
Simple merge
@@@ -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
Simple merge