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://git.lorimer.id.au/gitweb.git/diff_plain/1ff440fb41c65c34ea9a5b727ec2befda12dc34b?ds=inline;hp=-c

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
---

1ff440fb41c65c34ea9a5b727ec2befda12dc34b
diff --combined config.mak.uname
index d56613a139,4ef11ce418..d916d1dc7a
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -114,8 -114,6 +114,8 @@@ ifeq ($(uname_S),Darwin
  	HAVE_BSD_SYSCTL = YesPlease
  	FREAD_READS_DIRECTORIES = UnfortunatelyYes
  	HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
 +	BASIC_CFLAGS += -I/usr/local/include
 +	BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),SunOS)
  	NEEDS_SOCKET = YesPlease
@@@ -271,6 -269,7 +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
@@@ -394,9 -393,7 +395,9 @@@ ifeq ($(uname_S),Windows
  	CFLAGS =
  	BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
  	COMPAT_OBJS = compat/msvc.o compat/winansi.o \
 +		compat/win32/path-utils.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
 +		compat/win32/trace2_win32_process_info.o \
  		compat/win32/dirent.o
  	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
  	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE
@@@ -533,6 -530,7 +534,6 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_STRTOUMAX = YesPlease
  	NO_MKDTEMP = YesPlease
  	NO_SVN_TESTS = YesPlease
 -	NO_PERL_MAKEMAKER = YesPlease
  	RUNTIME_PREFIX = YesPlease
  	HAVE_WPGMPTR = YesWeDo
  	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
@@@ -549,7 -547,6 +550,7 @@@
  	COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
  	COMPAT_OBJS += compat/mingw.o compat/winansi.o \
 +		compat/win32/trace2_win32_process_info.o \
  		compat/win32/path-utils.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
  		compat/win32/dirent.o