Merge branch 'nd/fileno-may-be-macro'
commit1db999ce8d369dbf20532f1b2ea8cbbcf6f2cc7b
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 02:18:41 +0000 (13 18:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 02:18:41 +0000 (13 18:18 -0800)
tree2594969e363819ef50ad96ad999f352f35ea2a91
parentc73472a8deb9dc194d05747dda3061c6324750e4
parent18a4f6be6b4cfc34de6f80c36ab3ef951a0f7164
Merge branch 'nd/fileno-may-be-macro'

* nd/fileno-may-be-macro:
  git-compat-util: work around fileno(fp) that is a macro
Makefile
config.mak.uname
git-compat-util.h