From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 May 2019 15:37:28 +0000 (+0900)
Subject: Merge branch 'cc/aix-has-fileno-as-a-macro'
X-Git-Tag: v2.22.0-rc0~16
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/1ff440fb41c65c34ea9a5b727ec2befda12dc34b?hp=ec2642a2a127c192c2af239793a0f63f59845658

Merge branch 'cc/aix-has-fileno-as-a-macro'

AIX shared the same build issues with other BSDs around fileno(fp),
which has been corrected.

* cc/aix-has-fileno-as-a-macro:
Makefile: use fileno macro work around on AIX
---

diff --git a/config.mak.uname b/config.mak.uname
index d56613a139..d916d1dc7a 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -271,6 +271,7 @@ ifeq ($(uname_S),AIX)
 	INTERNAL_QSORT = UnfortunatelyYes
 	NEEDS_LIBICONV = YesPlease
 	BASIC_CFLAGS += -D_LARGE_FILES
+	FILENO_IS_A_MACRO = UnfortunatelyYes
 	ifeq ($(shell expr "$(uname_V)" : '[1234]'),1)
 		NO_PTHREADS = YesPlease
 	else